Fix types again.