Fix mapping informations