Fixing up the update stream