fix some random generators broken when refactoring things to improve contract-stronger?