vimmy fixes