Fixes for g++ vs. clang++