Fixes for data element mappings