More updates for new flags.