Fix all the broken crap