INFRA-124 - Misc fixes based on paratest failures