Updates based on QA feedback.

Quick updates from QA.