We fix a lot of problems