Fix a lot of things