Translation related fixes