Fixes for newer vagrant and upgraded cookbooks