Polygon Fix

Fix some problems