Quality and pref fixes