Various multi-os tweaks