More autocommands fixed