Fix constraint errors detected during functional tests