11-env-fix-1.patch & 12-env-fix-2.patch: From upstream, fix various environnement...