Fixing a couple of little issues