Fixed some environment variable quoting