Some fixes for vagrant
Fixes for Node
merge