Rectangular range fixes