fixing some useful mappings