More fixes for clang and older gcc