Modify various mappings to work, as far as I can tell