Teaspoon + Circle Fixes