Bugfixes in local mapping, esp. the paired variant.