Fix constrain violations