More preference tweaks