Fixed mapping errors