Additional RangeValidator fixes