Some adjustement related mostly to vagrant deployment