diff --git a/project/ToolkitBuild.xml b/project/ToolkitBuild.xml
index 6cf0e21d2..8d1389fcb 100644
--- a/project/ToolkitBuild.xml
+++ b/project/ToolkitBuild.xml
@@ -289,7 +289,8 @@
       <compilerflag value="-DNME_SIMD_D" if="NME_SIMD_D" />
       <compilerflag value="${NME_SIMD_D}" if="NME_SIMD_D" />
       <compilerflag value="-I${ANGLE_DIR}/include" if="NME_ANGLE" />
-
+      <compilerflag value="-DNME_GFX_DEBUG" if="NME_GFX_DEBUG" />
+      <compilerflag value="-DNME_NO_GLGETERROR" if="emscripten" unless="NME_GFX_DEBUG" />
 
       <cache value="1" unless="winrpi" />
       <cache value="1" asLibrary="true" if="winrpi NME_STATIC_LINK" />
diff --git a/project/src/common/ExternalInterface.cpp b/project/src/common/ExternalInterface.cpp
index 5ff5fa9cb..ad8d1afff 100644
--- a/project/src/common/ExternalInterface.cpp
+++ b/project/src/common/ExternalInterface.cpp
@@ -16,7 +16,6 @@
 #define NME_NO_LZMA
 #endif
 
-
 #ifdef ANDROID
 #include <android/log.h>
 #endif
diff --git a/project/src/opengl/OGLTexture.cpp b/project/src/opengl/OGLTexture.cpp
index 3774e106c..c74e2d228 100644
--- a/project/src/opengl/OGLTexture.cpp
+++ b/project/src/opengl/OGLTexture.cpp
@@ -387,6 +387,7 @@ class OGLTexture : public Texture
 
       if (mMipmaps)
       {
+         #if (!defined(EMSCRIPTEN) || !defined(NME_NO_GETERROR))
          glGetError();
          glGenerateMipmap(GL_TEXTURE_2D);
          int err = glGetError();
@@ -395,6 +396,7 @@ class OGLTexture : public Texture
             ELOG("Error creating mipmaps @ %dx%d,%d/%d : %d\n", mTextureWidth, mTextureHeight, store_format,pixel_format,  err);
             mMipmaps = false;
          }
+         #endif
       }
 
       mUploadedFormat = store_format;
@@ -528,9 +530,11 @@ class OGLTexture : public Texture
             if (mMipmaps)
                glGenerateMipmap(GL_TEXTURE_2D);
 
+            #ifndef NME_NO_GETERROR
             int err = glGetError();
             if (err != GL_NO_ERROR)
                ELOG("GL Error: %d %dx%d", err, mDirtyRect.w, mDirtyRect.h);
+            #endif
             mDirtyRect = Rect();
          }
       }
diff --git a/project/src/opengl/OpenGLContext.cpp b/project/src/opengl/OpenGLContext.cpp
index bdfa94466..4b623e953 100644
--- a/project/src/opengl/OpenGLContext.cpp
+++ b/project/src/opengl/OpenGLContext.cpp
@@ -37,8 +37,6 @@ void ReloadExtentions();
 
 // --- HardwareRenderer Interface ---------------------------------------------------------
 
-
-
 void ResetHardwareContext()
 {
    //__android_log_print(ANDROID_LOG_ERROR, "NME", "ResetHardwareContext");
@@ -108,8 +106,20 @@ class OGLContext : public HardwareRenderer
       for(int i=0;i<PROG_COUNT;i++)
          mProg[i] = 0;
 
+
       makeCurrent();
 
+      #ifdef NME_GFX_DEBUG
+      printf("Vendor: %s\n", (char *)glGetString(GL_VENDOR) );
+      printf("Renderer: %s\n", (char *)glGetString(GL_RENDERER) );
+      printf("Sahder: %s\n", (char *)glGetString(GL_SHADING_LANGUAGE_VERSION) );
+      #endif
+
+      #ifdef EMSCRIPTEN
+      for(int i=0;i<4;i++)
+         glDisableVertexAttribArray(i);
+      #endif
+
       const char *ext = (const char *)glGetString(GL_EXTENSIONS);
       if (ext && *ext)
       {
@@ -470,10 +480,11 @@ class OGLContext : public HardwareRenderer
    void BeginDirectRender()
    {
       gDirectMaxAttribArray = 0;
+      #ifndef NME_NO_GETERROR
       int err0 = glGetError();
       if (err0 != GL_NO_ERROR)
            ELOG("GL Error Before BeginDirectRender %d\n", err0);
-
+      #endif
    }
 
    void EndDirectRender()
@@ -481,9 +492,11 @@ class OGLContext : public HardwareRenderer
       for(int i=0;i<gDirectMaxAttribArray;i++)
          glDisableVertexAttribArray(i);
 
+      #ifndef NME_NO_GETERROR
       int err = glGetError();
       if (err != GL_NO_ERROR)
            ELOG("GL Error in DirectRender %d\n", err);
+      #endif
    }
 
 
diff --git a/project/src/sdl2/SDL2Stage.cpp b/project/src/sdl2/SDL2Stage.cpp
index d427ad101..909bf7fd5 100644
--- a/project/src/sdl2/SDL2Stage.cpp
+++ b/project/src/sdl2/SDL2Stage.cpp
@@ -2961,6 +2961,7 @@ EMSCRIPTEN_KEEPALIVE int nmeOnCanvasSize()
 }
 }
 
+
 void StartAnimation()
 {
    SDL_Event event;
@@ -2974,7 +2975,9 @@ void StartAnimation()
       #endif
    }
 
+   #ifndef NME_NO_AUDIO
    clUpdateAsyncChannels();
+   #endif
 
    if (sCheckCanvasSize)
    {