Minor fixes for clang and older compilers