Fix all the other things