Fix conflicts with constraints