more clang / mac-osx compile fixes