[WIP] Additional RangeValidator fixes