Auto battle, minor fixes