Fixes for vim