HH-40443 review fixes (should be squashed)