Moved around the autocmds