fixes for hypervisors using new option formatting