fixes for clang-503.0.40