Fixes for master + Range sketch