Fix all of the stuff I broke