fix type issues with mappers