state machine data fixes