Fixes for Vagrant 1.4+