Some changes including to vim