Fix all of the things