diff --git a/extras/webp_to_sdl.c b/extras/webp_to_sdl.c
index 461d4c72..3dabc46b 100755
--- a/extras/webp_to_sdl.c
+++ b/extras/webp_to_sdl.c
@@ -28,6 +28,7 @@
 #include <SDL/SDL.h>
 #endif
 
+static int init_ok = 0;
 int WebpToSDL(const char* data, unsigned int data_size) {
   int ok = 0;
   VP8StatusCode status;
@@ -42,7 +43,10 @@ int WebpToSDL(const char* data, unsigned int data_size) {
     return 1;
   }
 
-  SDL_Init(SDL_INIT_VIDEO);
+  if (!init_ok) {
+    SDL_Init(SDL_INIT_VIDEO);
+    init_ok = 1;
+  }
 
   status = WebPGetFeatures((uint8_t*)data, (size_t)data_size, &config.input);
   if (status != VP8_STATUS_OK) goto Error;
@@ -97,6 +101,7 @@ int WebpToSDL(const char* data, unsigned int data_size) {
  Error:
   SDL_FreeSurface(surface);
   SDL_FreeSurface(screen);
+  WebPFreeDecBuffer(output);
   return ok;
 }
 
diff --git a/webp_js/index.html b/webp_js/index.html
index 3ac9325f..10873a98 100644
--- a/webp_js/index.html
+++ b/webp_js/index.html
@@ -12,12 +12,15 @@
   <script type="text/javascript" src="./webp.js"></script>
   <script type="text/javascript">
 
+'use strict';
+
 // main wrapper for the function decoding a WebP into a canvas object
 var WebpToCanvas;
 
 function init() {
   WebpToCanvas = Module.cwrap('WebpToSDL', 'number', ['array', 'number']);
 }
+window.onload = init;
 
 function decode(webp_data, canvas_id) {
   // get the canvas to decode into
@@ -27,10 +30,10 @@ function decode(webp_data, canvas_id) {
   Module.canvas = canvas;
   canvas.getContext('2d').clearRect(0, 0, canvas.width, canvas.height);
   // decode and measure timing
-  start = new Date();
+  var start = new Date();
   var ret = WebpToCanvas(webp_data, webp_data.length);
-  end = new Date();
-  speed_result = document.getElementById('timing');
+  var end = new Date();
+  var speed_result = document.getElementById('timing');
   // display timing result
   if (speed_result != null) {
     var decode_time = end - start;
@@ -53,7 +56,7 @@ function loadfile(filename, canvas_id) {
   </script>
 </head>
 
-<body onload='init()'>
+<body>
   <p>
     <strong>WebP in JavaScript demo</strong> -
   </p>
diff --git a/webp_js/index_wasm.html b/webp_js/index_wasm.html
index 21950632..b77c22c4 100644
--- a/webp_js/index_wasm.html
+++ b/webp_js/index_wasm.html
@@ -11,6 +11,11 @@
   </script>
   <script type="text/javascript">
 
+'use strict';
+
+// main wrapper for the function decoding a WebP into a canvas object
+var WebpToCanvas;
+
 function init() {
   var xhr = new XMLHttpRequest();
   xhr.open('GET', 'webp_wasm.wasm', true);
@@ -23,6 +28,7 @@ function init() {
   };
   xhr.send(null);
 }
+window.onload = init;
 
 function decode(webp_data, canvas_id) {
   var result;
@@ -36,16 +42,16 @@ function decode(webp_data, canvas_id) {
     Module.canvas = canvas;
     canvas.getContext('2d').clearRect(0, 0, canvas.width, canvas.height);
     // decode and measure timing
-    start = new Date();
+    var start = new Date();
     var ret = WebpToCanvas(webp_data, webp_data.length);
-    end = new Date();
+    var end = new Date();
     var decode_time = end - start;
     result = 'decoding time: ' + decode_time +' ms.';
   } else {
     result = "WASM module not finished loading! Please retry";
   }
   // display timing result
-  speed_result = document.getElementById('timing');
+  var speed_result = document.getElementById('timing');
   if (speed_result != null) {
     speed_result.innerHTML = '<p>'+ result + '</p>';
   }
@@ -66,7 +72,7 @@ function loadfile(filename, canvas_id) {
   </script>
 </head>
 
-<body onload='init()'>
+<body>
   <p>
     <strong>WebP demo using Web-Assembly</strong> -
   </p>
