Bug fixes to avoid adding multiple constraints to the same property