Fixes to polygons