Minor changes to Point2D template