Fix a couple of stray issues