Fix Clang compiler errors