Changes to support vm and gem home.