Minor fixes.  clean up