Fixing a few things.