More type mismatch fixing.