Resolved some untranslatable text strings and multisite related code changes