Fixed some generation VI stuff