Fixing a couple of minor things