Fixes to display and prefs modules