fixes(mapping): small fixes

Viacheslav Sukhovieiev requested to merge demo/slava/small_fixes into main

Merge request reports