Few more Polyline fixes