Fixing a couple of other bugs