patch up some clang/apple issues