Merge "Fix env regexes"