Updates after EULCS w3d1