Fixing a few things after initial commit.