Fixing a couple of little bugs.