Fix brittle pivot margins