re-enable the fix for broken friction in Clang (got accidently undone in a recent commit)
fix OSX build