Fix type mappings.