Fixes for mappings.