Fix error mappings