Fix MacOSX backend post-six transition