Constraint checks fixed