Fix up some group combat bugs and other errors