Fix some atom mappings