Manually merge some missing type mappings from master