SwitchYard: Small Fixes