Minor fixes

Some minor typos and cleanup for a few things.