Fix mandatory command flags