Small fixes for user settings