Corp map fixes

https://www.pivotaltracker.com/story/show/81801860
https://www.pivotaltracker.com/story/show/81802792