Bug 16111: (QA follow-up) Few additional corrections