Fix all the problems :D