further updates for clang compiles