Fix bugs in mapper after testing