Fixed typemapping issues where mappings were being overridden