additional mappings and fixes