Multiple fixes for vi