Fixed some fsm features