Merging in Boone's fixes
More minor fixes from last commit