make newest refactoring build on macosx