SwitchYard: Small fixes