- Fix handling of preferences.