Fix all the things that the client wants