Expedient changes to support spirent vm