bugfixes after some testing with Vagrant