Fixing environments/productions