Bug 11876: (qa-followup) some minor changes