Some fixes after playing with vagrant