Fixed more flags