More vagrant changes