cleanup minor issues found with clang and ninja build