Fixing a few small issues.