Fix mapping tables