Issue 2333

Fixes as recommended in https://github.com/mitchellh/vagrant/issues/2333#issuecomment-28997837