diff --git a/hdr.c b/hdr.c
index bd73d7a..37351df 100644
--- a/hdr.c
+++ b/hdr.c
@@ -370,7 +370,7 @@ static void set_hdr_metadata(int color,int trc, AVFrameSideData *sd1, AVFrameSid
     if (md)
         memcpy(&md_save,md,sizeof(md_save));
         
-    printf("Update HDR to TRC %d color %d\n",trc,color);
+    Debug(3,"Update HDR to TRC %d color %d\n",trc,color);
 
     if (trc == AVCOL_TRC_BT2020_10)
         trc = AVCOL_TRC_ARIB_STD_B67;
@@ -471,6 +471,7 @@ static void set_hdr_metadata(int color,int trc, AVFrameSideData *sd1, AVFrameSid
     ret = drmModeCreatePropertyBlob(render->fd_drm, &data, sizeof(data), &blob_id);
     if (ret) {
         printf("DRM: HDR metadata: failed blob create \n");
+		blob_id = 0;
         return;
     }
 
@@ -481,11 +482,12 @@ static void set_hdr_metadata(int color,int trc, AVFrameSideData *sd1, AVFrameSid
              
         if (blob_id)
             drmModeDestroyPropertyBlob(render->fd_drm, blob_id);
+		blob_id = 0;
         return;
     }
     m_need_modeset = 1;
         
-    printf("DRM: HDR metadata: prop set\n");
+    Debug(3,"DRM: HDR metadata: prop set\n");
            
 }
 
diff --git a/openglosd.cpp b/openglosd.cpp
index a781444..005a6fe 100644
--- a/openglosd.cpp
+++ b/openglosd.cpp
@@ -26,7 +26,7 @@ const char *glversion = "#version 330 core ";
 #ifdef RASPI
 const char *glversion = "#version 300 es";
 #else
-const char *glversion = "#version 320 es  ";
+const char *glversion = "#version 300 es  ";
 #endif
 #endif
 
diff --git a/shaders.h b/shaders.h
index ef44bee..724ab26 100644
--- a/shaders.h
+++ b/shaders.h
@@ -6,7 +6,7 @@ const char *gl_version = "#version 330";
 #ifdef RASPI
 const char *gl_version = "#version 300 es";
 #else
-const char *gl_version = "#version 320 es ";
+const char *gl_version = "#version 300 es ";
 #endif
 #endif
 
diff --git a/video.c b/video.c
index 5fa098a..ca950fe 100644
--- a/video.c
+++ b/video.c
@@ -5261,6 +5261,9 @@ static void *VideoHandlerThread(void *dummy)
     }
 #ifdef PLACEBO
     pthread_cleanup_pop(NULL);
+#endif
+#ifdef USE_DRM
+    drm_clean_up();
 #endif
     return dummy;
 }
@@ -6693,6 +6696,7 @@ void VideoInit(const char *display_name)
 ///
 void VideoExit(void)
 {
+    Debug(3,"Video Exit\n");
 #ifndef USE_DRM
     if (!XlibDisplay) {                 // no init or failed
         return;
@@ -6749,9 +6753,7 @@ void VideoExit(void)
         Connection = 0;
     }
 #endif
-#ifdef USE_DRM
-    drm_clean_up();
-#endif
+
 }
 
 #ifdef USE_DRM