Overwrite fix.

VI navigation improvements.