Adding machine type code.
Properly setting machine type to  virtual for known virtual machines.