Upgrade to Go-env