Translation improvements #2