Settings: more fixes