Mac - update environment parsing