#14 Constraint fixes