Added workaround for MacOSX
More MacOSX workarounds
More MacOSX workarounds