circle/convex fixes