SmileMapper fixes