Fixed some small things in mapper