Fixing mapper errors causes by passing safe types into unsafe