Minor pref loading improvements.