Fixes to vimrc