Bug fixes with WO and Sketch