Tweak generation logic after testing in a Vagrant VM