more Mint changes

to support Mint...