Fix generated types