polishing fixes around the inclusion of Polygon rings