Small fixes for clang