Added missing constraints after merge