SwitchYard small fixes