SwitchYard: small fixes