Sketch & other fixes