Range performance tweaks