Fixed datatypes.
Fixed mapping.
Improved type coercions.