Fixed the stuff, sort of