Some more EARLY Gen VI support