Minor cleanup and localization work...