Fix/osx hack harder synchronization restrictions

/cc @bnoordhuis