Last settings fixs