ALL OF THE FIXES