Fix all the things!