Fixes for clang