Updates after EULCS w3