Urgh, I should have tested all this in Vagrant