Found a couple of minor issues while testing