Fix state machine and info objects