INFRA-642, fixes from QA report

Plus other related fixes based on the underlying issue. Plus one
cosmetic fix.