Fixes Bug 915304 - String adjustments per KaiRo's requests.