Fix issues with some missed mappings.