Add fixes in deploy vm script

Change-Id: I0ad8cad05bcd3f2c16b38959445ae42ad5f50aec