Bug 10851: (follow-up) fix issues reported by QA script