bug fixes around mappings + faults