Fixes for Clang+Apple