- State machine fixes