Fixes for vmware/vagrant packaging