Some fixes for Clang