Fixes to circle interaction