Settings: fixes and cleanup