Upstream sync fixes