Adding some mods from the Linux side, to switch to Mac