More fixes to Range