Some changes to get polygons working with new cluster code.