Added fixes to the make_settings function.