[SWITCHYARD-2469] More fixes