Tweaks for vim74