Adjustment to fixes for EUCA-5133