Fix a couple things