Fixed some mapping bugs