Switching to the new set of flags, some of them are missing, this is to be fixed.