Updates from wm1(2)