More BugFixes to translation routines