Fixing 5.0.0 L10N issues