Fix all of the rest