Add new alias for Vagrant and several fix