Fix manipulation of domain env variables