INFR-25344 - Fixes