Several fixes, including various mappings