bugid-94800 | S:MTb fixes after jsLint