Fixes for range selection