INFRA-682: fixes per Sreedhar's comments.