Fixed some settings-related problems