Setttings: Cleanups and fixes