Fix environment variables (#362)