Fix few issues in fsm viewer