Trasnslation fixes