Bugfixes for iterative mapping