Compile fixes (clang)