Lots more settings related tweaks