Fix all the things, as tim said