XX-10698 - fix bugs after initial testing