Update TODOs in FSM1 and FSM2