diff --git a/src/meta/ea_eaac.c b/src/meta/ea_eaac.c
index 6395023f..33c8e1b7 100644
--- a/src/meta/ea_eaac.c
+++ b/src/meta/ea_eaac.c
@@ -1068,7 +1068,7 @@ static size_t calculate_eaac_size(VGMSTREAM *vgmstream, STREAMFILE *streamFile,
             file_size = get_streamfile_size(streamFile);
             vgmstream->next_block_offset = start_offset;
 
-            while (vgmstream->next_block_offset < file_size && total_samples != vgmstream->num_samples) {
+            while (vgmstream->next_block_offset < file_size && total_samples != eaac->num_samples) {
                 block_update_ea_sns(vgmstream->next_block_offset, vgmstream);
                 if (vgmstream->current_block_samples == 0)
                     continue;
diff --git a/src/meta/ea_schl.c b/src/meta/ea_schl.c
index fe6de71d..4287e146 100644
--- a/src/meta/ea_schl.c
+++ b/src/meta/ea_schl.c
@@ -845,22 +845,22 @@ static VGMSTREAM * init_vgmstream_ea_variable_header(STREAMFILE *streamFile, ea_
         vgmstream->layout_type = layout_none;
 
         /* BNKs usually have absolute offsets for all channels ("full" interleave) except in some versions */
-        if (vgmstream->channels > 1 && ea->codec1 == EA_CODEC1_PCM) {
-            int interleave = (vgmstream->num_samples * (ea->bps == 8 ? 0x01 : 0x02)); /* full interleave */
-            for (i = 0; i < vgmstream->channels; i++) {
+        if (ea->channels > 1 && ea->codec1 == EA_CODEC1_PCM) {
+            int interleave = (ea->num_samples * (ea->bps == 8 ? 0x01 : 0x02)); /* full interleave */
+            for (i = 0; i < ea->channels; i++) {
                 ea->offsets[i] = ea->offsets[0] + interleave*i;
             }
         }
-        else if (vgmstream->channels > 1 && ea->codec1 == EA_CODEC1_VAG) {
-            int interleave = (vgmstream->num_samples / 28 * 16); /* full interleave */
-            for (i = 0; i < vgmstream->channels; i++) {
+        else if (ea->channels > 1 && ea->codec1 == EA_CODEC1_VAG) {
+            int interleave = (ea->num_samples / 28 * 16); /* full interleave */
+            for (i = 0; i < ea->channels; i++) {
                 ea->offsets[i] = ea->offsets[0] + interleave*i;
             }
         }
-        else if (vgmstream->channels > 1 && ea->codec2 == EA_CODEC2_GCADPCM && ea->offsets[0] == ea->offsets[1]) {
+        else if (ea->channels > 1 && ea->codec2 == EA_CODEC2_GCADPCM && ea->offsets[0] == ea->offsets[1]) {
             /* pcstream+gcadpcm with sx.exe v2, this is probably a bug (even with this parts of the wave are off) */
-            int interleave = (vgmstream->num_samples / 14 * 8); /* full interleave */
-            for (i = 0; i < vgmstream->channels; i++) {
+            int interleave = (ea->num_samples / 14 * 8); /* full interleave */
+            for (i = 0; i < ea->channels; i++) {
                 ea->offsets[i] = ea->offsets[0] + interleave*i;
             }
         }
@@ -917,7 +917,7 @@ static VGMSTREAM * init_vgmstream_ea_variable_header(STREAMFILE *streamFile, ea_
             {
                 int16_t (*read_16bit)(off_t,STREAMFILE*) = ea->big_endian ? read_16bitBE : read_16bitLE;
 
-                for (ch=0; ch < vgmstream->channels; ch++) {
+                for (ch=0; ch < ea->channels; ch++) {
                     for (i=0; i < 16; i++) { /* actual size 0x21, last byte unknown */
                         vgmstream->ch[ch].adpcm_coef[i] = read_16bit(ea->coefs[ch] + i*2, streamFile);
                     }
@@ -965,7 +965,7 @@ static VGMSTREAM * init_vgmstream_ea_variable_header(STREAMFILE *streamFile, ea_
 
             /* make relative loops absolute for the decoder */
             if (ea->loop_flag) {
-                for (i = 0; i < vgmstream->channels; i++) {
+                for (i = 0; i < ea->channels; i++) {
                     ea->loops[i] += ea->offsets[0];
                 }
             }