Fix a couple issues with auto-anvil