ALL THE FIXES!