more pattern/warp fixes