Fix a lot of problems