Various minor cleanup
Merge pull request #566 from mc10/minor-fixes

Various minor cleanup