ALL THE FIXES