Fixes for Vagrant 1.5