Dev-freeze fixes

Fixes #4455
Fixes a few other map bugs (details in commit: 8fd0378)
Fixes and cleanup for my pipe standardization PR: #4385 (details in commit: f451fd4)