Better handling of Mac path setup