Vi binding fixes
.