Some fixes.
Add alternative mappings.