Fix new cases revealed by new tests