Fixes several issues in the translation