Fix all the things