Fix a couple of things again