Fix base references
Fix .vimrc