Some bad mappings. These will need review.