Added MacOS workarounds.
Added MacOS workarounds.
Added MacOS workarounds.