Fix mismatches reported by jbart