Fixed references to extraData