Fix mapping errors