More fixes (will fix battle properly later)