Updates after EULCS w6