Cleanup some clang warnings