More updates to translation routines