Adding some other needed functionality for vim.