Update upstream

A couple of updates we need.