Fix autocmd problems