Minor fixes and localized strings