diff --git a/tunnel.c b/tunnel.c
index 4c55afc..d808254 100644
--- a/tunnel.c
+++ b/tunnel.c
@@ -48,7 +48,7 @@ static int msg_read_string(int fd, char* buffer, uint8_t max_length)
     return 0;
 }
 
-static uint8_t* msg_read_payload(int fd, uint16_t* size)
+static uint8_t* msg_read_payload(int fd, uint32_t* size)
 {
     uint8_t* data;
     if(read(fd,size,sizeof(*size)) == -1)
diff --git a/tunnel.h b/tunnel.h
index 1449666..377ceae 100644
--- a/tunnel.h
+++ b/tunnel.h
@@ -22,7 +22,7 @@ typedef struct {
     uint8_t type;
     uint16_t channel_id;
     uint16_t client_id;
-    uint16_t size;
+    uint32_t size;
 } tunnel_msg_h_t;
 
 typedef struct{
diff --git a/v4l2cam/v4l2cam.c b/v4l2cam/v4l2cam.c
index f001964..9c694e6 100644
--- a/v4l2cam/v4l2cam.c
+++ b/v4l2cam/v4l2cam.c
@@ -288,6 +288,17 @@ static int cam_stop_streaming(int fd)
 }
 static int cam_cleanup(cam_setting_t *opts, int close_fd)
 {
+    if (video_setting.queued == 1)
+    {
+        if (cam_dequeue_buffer(video_setting.fd) == -1)
+        {
+            return -1;
+        }
+        else
+        {
+            video_setting.queued = 0;
+        }
+    }
     if (cam_stop_streaming(opts->fd) == -1)
     {
         M_ERROR(MODULE_NAME, "Unable to stop streaming");
@@ -308,12 +319,18 @@ static int cam_apply_setting(cam_setting_t *opts)
 {
     if (opts->raw_buffer != NULL)
     {
-        if (cam_cleanup(opts, 0) == -1)
+        if (cam_cleanup(opts, 1) == -1)
         {
             M_ERROR(MODULE_NAME, "Unable to cleanup setting");
             return -1;
         }
     }
+    opts->fd = open(opts->dev_name, O_RDWR);
+    if (opts->fd == -1)
+    {
+        M_ERROR(MODULE_NAME, "Unable to open device: %s", video_setting.dev_name);
+        return -1;
+    }
     if (cam_set_format(opts) == -1)
     {
         M_ERROR(MODULE_NAME, "Unable to set format");
@@ -382,13 +399,6 @@ int main(const int argc, const char **argv)
     video_setting.jpeg_quality = 60;
     video_setting.raw_buffer = NULL;
     video_setting.queued = 0;
-
-    video_setting.fd = open(video_setting.dev_name, O_RDWR);
-    if (video_setting.fd == -1)
-    {
-        M_ERROR(MODULE_NAME, "Unable to open device: %s", video_setting.dev_name);
-        exit(1);
-    }
     // apply the default setting
     if (cam_apply_setting(&video_setting) == -1)
     {
@@ -461,9 +471,7 @@ int main(const int argc, const char **argv)
                 video_setting.queued = 1;
             }
         }
-
-        status = select(sock + 1, &fd_in, NULL, NULL, NULL);
-
+        status = select(maxfd + 1, &fd_in, NULL, NULL, NULL);
         switch (status)
         {
         case -1:
@@ -506,6 +514,11 @@ int main(const int argc, const char **argv)
                             (void)memcpy(&video_setting.fps, msg.data + offset, 1);
                             offset++;
                             (void)memcpy(&video_setting.jpeg_quality, msg.data + offset, 1);
+                            M_LOG(MODULE_NAME, "Client request width: %d, height: %d, FPS: %d, JPEG quality: %d",
+                                    video_setting.width,
+                                    video_setting.height,
+                                    video_setting.fps,
+                                    video_setting.jpeg_quality);
                             if (cam_apply_setting(&video_setting) == -1)
                             {
                                 M_ERROR(MODULE_NAME, "Unable to apply video setting");
@@ -519,20 +532,6 @@ int main(const int argc, const char **argv)
                                 {
                                     running = 0;
                                 }
-                                else
-                                {
-                                    if (video_setting.queued == 1)
-                                    {
-                                        if (cam_dequeue_buffer(video_setting.fd) == -1)
-                                        {
-                                            running = 0;
-                                        }
-                                        else
-                                        {
-                                            video_setting.queued = 0;
-                                        }
-                                    }
-                                }
                             }
                         }
                         else
@@ -555,6 +554,11 @@ int main(const int argc, const char **argv)
                     running = 0;
                 }
             }
+            else
+            {
+                // sleep to save CPU 100 ms
+                usleep(100000);
+            }
         }
     }