applied fixes based on actual testing with vagrant