WIP: Preference fixes