Bug 17698: (QA follow-up) Fix minors design issues