Fixed a couple of minor issues