Fix a lot of more issues