Fix #21. Fix issues with l10n.