More clang compiler fixes