Fixing up some more minor bugs