diff --git a/src/library_glemu.js b/src/library_glemu.js
index bf01ba6f531da..654ee7a130db8 100644
--- a/src/library_glemu.js
+++ b/src/library_glemu.js
@@ -417,8 +417,7 @@ var LibraryGLEmulation = {
                    (GL.currentContext.compressionExt ? ' GL_ARB_texture_compression GL_EXT_texture_compression_s3tc' : '') +
                    (GL.currentContext.anisotropicExt ? ' GL_EXT_texture_filter_anisotropic' : '')
             );
-            GL.stringCache[name_] = ret;
-            return ret;
+            return GL.stringCache[name_] = {{{ to64('ret') }}};
         }
         return glGetString(name_);
       };
@@ -3672,6 +3671,7 @@ var LibraryGLEmulation = {
     GLImmediate.matrixLib.mat4.set({{{ makeHEAPView('F64', 'matrix', 'matrix+' + (16*8)) }}}, GLImmediate.matrix[GLImmediate.currentMatrix]);
   },
 
+  glLoadMatrixf__sig: 'vp',
   glLoadMatrixf: function(matrix) {
 #if GL_DEBUG
     if (GL.debug) dbg('glLoadMatrixf receiving: ' + Array.prototype.slice.call(HEAPF32.subarray(matrix >> 2, (matrix >> 2) + 16)));
diff --git a/test/aniso.c b/test/browser/test_anisotropic.c
similarity index 100%
rename from test/aniso.c
rename to test/browser/test_anisotropic.c
diff --git a/test/aniso.png b/test/browser/test_anisotropic.png
similarity index 100%
rename from test/aniso.png
rename to test/browser/test_anisotropic.png
diff --git a/test/water.dds b/test/browser/water.dds
similarity index 100%
rename from test/water.dds
rename to test/browser/water.dds
diff --git a/test/test_browser.py b/test/test_browser.py
index 8c031df58e385..4aa8dfaae6e06 100644
--- a/test/test_browser.py
+++ b/test/test_browser.py
@@ -2249,9 +2249,10 @@ def test_s3tc_ffp_only(self):
     self.btest('s3tc.c', reference='s3tc.png', args=['--preload-file', 'screenshot.dds', '-sLEGACY_GL_EMULATION', '-sGL_FFP_ONLY', '-lGL', '-lSDL'])
 
   @requires_graphics_hardware
-  def test_aniso(self):
-    shutil.copyfile(test_file('water.dds'), 'water.dds')
-    self.btest('aniso.c', reference='aniso.png', reference_slack=2, args=['--preload-file', 'water.dds', '-sLEGACY_GL_EMULATION', '-lGL', '-lSDL', '-Wno-incompatible-pointer-types'])
+  @also_with_wasm64
+  def test_anisotropic(self):
+    shutil.copyfile(test_file('browser/water.dds'), 'water.dds')
+    self.btest('browser/test_anisotropic.c', reference='browser/test_anisotropic.png', reference_slack=2, args=['--preload-file', 'water.dds', '-sLEGACY_GL_EMULATION', '-lGL', '-lSDL', '-Wno-incompatible-pointer-types'])
 
   @requires_graphics_hardware
   def test_tex_nonbyte(self):