diff --git a/hgdriver/hgdev/hg_scanner.cpp b/hgdriver/hgdev/hg_scanner.cpp
index 35eb99b..74f9e91 100644
--- a/hgdriver/hgdev/hg_scanner.cpp
+++ b/hgdriver/hgdev/hg_scanner.cpp
@@ -3407,6 +3407,7 @@ int hg_scanner::device_io_control(unsigned long code, void* data, unsigned* len)
 		SIZE	size = paper_size(paper);
 
 		*len = (size.cx & 0x0ffff) | ((size.cy & 0x0ffff) << 16);
+		return SCANNER_ERR_OK;
 	}
 	else if (code == IO_CTRL_CODE_CONVERT_IMAGE_FORMAT)
 	{
@@ -3443,23 +3444,26 @@ int hg_scanner::device_io_control(unsigned long code, void* data, unsigned* len)
 	else if(code == IO_CTRL_CODE_SET_SCAN_LOCK_CHECK_VAL)
 	{
 		string str = (char*)data;
-		set_scan_lock_check_val(str);
+		
+		return set_scan_lock_check_val(str);
 	}
 	else if (code == IO_CTRL_CODE_SET_SCAN_LOCK)
 	{
 		SANE_Bool set_islock = *((SANE_Bool *)data);
-		set_scan_islock(set_islock);
+		
+		return set_scan_islock(set_islock);
 	}
 	else if (code == IO_CTRL_CODE_GET_SCAN_ISLOCK)
 	{
 		SANE_Bool islock = *((SANE_Bool*)data);
-		get_scan_islock(&islock);
+		int ret = get_scan_islock(&islock);
 		*((SANE_Bool*)data) = islock;
+		return ret;
 	}
 	else if (code == IO_CTRL_CODE_SET_FIRMWARE_UPGRADE)
 	{
 		string str = (char*)data;
-		firmware_upgrade(str);
+		return firmware_upgrade(str);
 	}
 	return SCANNER_ERR_DEVICE_NOT_SUPPORT;
 }
diff --git a/hgdriver/hgdev/hg_scanner_239.cpp b/hgdriver/hgdev/hg_scanner_239.cpp
index a602bbb..f79e0ba 100644
--- a/hgdriver/hgdev/hg_scanner_239.cpp
+++ b/hgdriver/hgdev/hg_scanner_239.cpp
@@ -6,7 +6,7 @@
 #include "scanner_manager.h"
 #endif
 
-#include <map>
+
 
 //#define SAVE_TO_FILE