A host of upstream updates