WyC: fixes for the last few failing conversions.