Small improvements for flags

when a state is skipped