Build fixes for clang