Patches to move settings to right area.