Localization fixes for 2.4.0-beta1