Fixed some mapper.