Fix all the things (it works!)