Update in the light of upstream SSA changes