Fix a buttload of things