Fix a couple of things