INFRA-593: Fixes from QA review.