Fixes #512 and other translation details