Improvements for the flag requirements/conflicts