Fix a couple of minor issues