Fixed battle bugs