Fixing a bunch of minor things.