More translation tweaks