Some TODO items management (additional state checking).