Some more changes to the FSM.