Fixed a few minor issues noticed by new version of Clang