Minor fixes for Clang