Fix compile errors and test failures in UDT mapping.
Merge pull request #196 from olim7t/fix_mapper

Fix compile errors and test failures in UDT mapping.