Merge pull request #1507 from YosysHQ/clifford/verificfixes