MASTERING FIXES