Fixes for Clang/Linux