Fix the stuff