Fix up more flags