Fix all the problems