Fix types