Vagrant development environment + small fixes