Postmerge mapfix.

- Fixed some wrong copypastes.