Fixed battle bugs.