Store and Battle fixes