Polygon fixes