Bug 16187: (QA follow-up) Additional fixes