mods for MacOS, first cut