Fix the excludes to sue the extended environment variables