Move missing 2 autocommands in group