Fix a lot of initial stuff