Changes to some constraints