Fixing a few weird things.