Fix more broken mappings