diff --git a/platform/drivers/display/display_libSDL.c b/platform/drivers/display/display_libSDL.c
index 71f30706..ae30ab69 100644
--- a/platform/drivers/display/display_libSDL.c
+++ b/platform/drivers/display/display_libSDL.c
@@ -52,7 +52,7 @@ void lcd_init()
     else
     {
 
-        window = SDL_CreateWindow("",
+        window = SDL_CreateWindow(" ",
                                   SDL_WINDOWPOS_UNDEFINED,
                                   SDL_WINDOWPOS_UNDEFINED,
                                   SCREEN_WIDTH,SCREEN_HEIGHT,
@@ -70,7 +70,11 @@ void lcd_init()
 
 void lcd_terminate()
 {
+    while(inProgress) { }         /* Wait until current render finishes */
+    printf("Terminating SDL display emulator, goodbye!\n");
+    free(frameBuffer);
     SDL_DestroyWindow(window);
+    SDL_Quit();
 }
 
 uint16_t lcd_screenWidth()