Fix all the things (?)