Fixed translation mappers (half written by @oridan)