Minor fixes for clang