Fix a couple of minor issues noticed by Robert Frewell.