Got rid of all errors on curstate and XOR_sm when extracting.