CR and QA fixes.