Fix more regressions.
Fix regression in handling sketches.