Some clang related fixes