[RFC] Bug fixes to mapping

Bugfixes to mapping