Fixes for linux/clang build.