Fixed a couple mapping bugs.