Fix minor issues on mapping