Changed how environment variables are handled.