Fix some regressions

We had some bad conditional checks for state machine status polling.