Add some fixes for vimrc