KFSTP-1571: more fixes to hopefully satisfy the rice data upgrade job