Fixed a couple of minor things