WyC: more bug fixes for failing test cases.