Some fixes of the mapping file