fix: RectangularPointer, etc