More Extras work and fix an accidental error