Minor fixes

Nothing worth noting.  Just cleaning up local repository.