Fixing a few more minor bugs.