More fixes for settings