Adapt to common flags