Add missing constraints for vhd-tool