Postmerge mapfixes.

- Fixed some lost-in-merge piping, wiring etc.