Fix all the stuff