Fixing a few small things