diff --git a/UEFITool/uefitool.cpp b/UEFITool/uefitool.cpp
index d0a7e24..abd7cc5 100644
--- a/UEFITool/uefitool.cpp
+++ b/UEFITool/uefitool.cpp
@@ -17,7 +17,7 @@
 UEFITool::UEFITool(QWidget *parent) :
 QMainWindow(parent),
 ui(new Ui::UEFITool), 
-version(tr("0.30.0_alpha7"))
+version(tr("0.30.0_alpha8"))
 {
     clipboard = QApplication::clipboard();
 
diff --git a/common/ffs.h b/common/ffs.h
index 9c6848a..d14b151 100644
--- a/common/ffs.h
+++ b/common/ffs.h
@@ -53,10 +53,6 @@ const QByteArray EFI_CAPSULE_GUID
 const QByteArray INTEL_CAPSULE_GUID
 ("\xB9\x82\x91\x53\xB5\xAB\x91\x43\xB6\x9A\xE3\xA9\x43\xF7\x2F\xCC", 16);
 
-// Lenovo capsule GUID
-const QByteArray LENOVO_CAPSULE_GUID
-("\x8B\xA6\x3C\x4A\x23\x77\xFB\x48\x80\x3D\x57\x8C\xC1\xFE\xC4\x4D", 16);
-
 // Toshiba EFI Capsule header
 typedef struct _TOSHIBA_CAPSULE_HEADER {
     EFI_GUID  CapsuleGuid;
diff --git a/common/ffsparser.cpp b/common/ffsparser.cpp
index 7fef534..b1ddc31 100644
--- a/common/ffsparser.cpp
+++ b/common/ffsparser.cpp
@@ -71,8 +71,7 @@ STATUS FfsParser::parseImageFile(const QByteArray & buffer, const QModelIndex &
     UINT32 capsuleHeaderSize = 0;
     QModelIndex index;
     if (buffer.startsWith(EFI_CAPSULE_GUID)
-        || buffer.startsWith(INTEL_CAPSULE_GUID)
-        || buffer.startsWith(LENOVO_CAPSULE_GUID)) {
+        || buffer.startsWith(INTEL_CAPSULE_GUID)) {
         // Get info
         const EFI_CAPSULE_HEADER* capsuleHeader = (const EFI_CAPSULE_HEADER*)buffer.constData();
         capsuleHeaderSize = capsuleHeader->HeaderSize;
diff --git a/common/fitparser.cpp b/common/fitparser.cpp
index 04476ce..ef1d575 100644
--- a/common/fitparser.cpp
+++ b/common/fitparser.cpp
@@ -62,7 +62,7 @@ STATUS FitParser::parse(const QModelIndex & index, const QModelIndex & lastVtfIn
         // Calculate FIT entry checksum
         UINT8 calculated = calculateChecksum8((const UINT8*)fitHeader, fitSize);
         if (calculated) {
-            remark.append(tr("Invalid FIT table checksum, ").hexarg2(calculated, 2));
+            remark.append(tr("Invalid FIT table checksum, "));
         }
     }
 
@@ -159,9 +159,8 @@ STATUS FitParser::findFitRecursive(const QModelIndex & index, QModelIndex & foun
     // Get parsing data for the current item
     PARSING_DATA pdata = parsingDataFromQModelIndex(index);
 
-    // Check item's address to be in required range
-    INT32 offset = model->body(index).indexOf(FIT_SIGNATURE);
     // Check for FIT signature in item's body
+    INT32 offset = model->body(index).indexOf(FIT_SIGNATURE);
     if (offset >= 0) {
         // FIT candidate found, calculate it's physical address
         UINT32 fitAddress = pdata.address + model->header(index).size() + (UINT32)offset;