Fixing a couple of errors