Fix all the stupid errors causing barfing.