Fixing a couple of mistakes