Fixes translation related problems