Fixed environment variable quoting