Fix types again