Fix a couple accidents