Latest changes before leaving work on Vagrant-Azure due to several problems