Unification fixes for osx