Fixes to ES translation (to be completed)