Multiple map fixes

Fixes #4507
Fixes #4508
Fixes #4540