Cleanup some harmless issues found by Clang