Multiple map fixes

Fixes #4507
Fixes #4508
Fixes #4540
Merge pull request #4549 from Loganbacca/bayfix

Multiple map fixes