diff --git a/UEFIExtract/ffsdumper.cpp b/UEFIExtract/ffsdumper.cpp
index 4639d01..b495315 100644
--- a/UEFIExtract/ffsdumper.cpp
+++ b/UEFIExtract/ffsdumper.cpp
@@ -14,7 +14,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include "ffsdumper.h"
 
 FfsDumper::FfsDumper(TreeModel* treeModel, QObject *parent)
-    : model(treeModel), QObject(parent), dumped(false)
+    : QObject(parent), model(treeModel), dumped(false)
 {
 }
 
@@ -88,4 +88,4 @@ STATUS FfsDumper::recursiveDump(const QModelIndex & index, const QString & path)
     }
 
     return ERR_SUCCESS;
-}
\ No newline at end of file
+}
diff --git a/UEFIExtract/ffsdumper.h b/UEFIExtract/ffsdumper.h
index 9c7d17d..5c10d28 100644
--- a/UEFIExtract/ffsdumper.h
+++ b/UEFIExtract/ffsdumper.h
@@ -21,8 +21,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <QModelIndex>
 #include <QFileInfo>
 
-#include "..\common\basetypes.h"
-#include "..\common\treemodel.h"
+#include "../common/basetypes.h"
+#include "../common/treemodel.h"
 
 class FfsDumper : public QObject
 {
diff --git a/UEFIExtract/uefiextract_main.cpp b/UEFIExtract/uefiextract_main.cpp
index 6f011b8..daa5eb9 100644
--- a/UEFIExtract/uefiextract_main.cpp
+++ b/UEFIExtract/uefiextract_main.cpp
@@ -18,7 +18,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 #include <iostream>
 
-#include "..\common\ffsparser.h"
+#include "../common/ffsparser.h"
 #include "ffsdumper.h"
 
 int main(int argc, char *argv[])
diff --git a/UEFITool/ffsfinder.cpp b/UEFITool/ffsfinder.cpp
index 23642c9..17ab1f2 100644
--- a/UEFITool/ffsfinder.cpp
+++ b/UEFITool/ffsfinder.cpp
@@ -14,7 +14,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include "ffsfinder.h"
 
 FfsFinder::FfsFinder(const TreeModel* treeModel, QObject *parent)
-    : model(treeModel), QObject(parent)
+    : QObject(parent), model(treeModel)
 {
 }
 
diff --git a/UEFITool/ffsfinder.h b/UEFITool/ffsfinder.h
index 3d30c8e..5e49d77 100644
--- a/UEFITool/ffsfinder.h
+++ b/UEFITool/ffsfinder.h
@@ -19,8 +19,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <QString>
 #include <QModelIndex>
 
-#include "..\common\basetypes.h"
-#include "..\common\treemodel.h"
+#include "../common/basetypes.h"
+#include "../common/treemodel.h"
 
 class FfsFinder : public QObject
 {
diff --git a/UEFITool/ffsops.cpp b/UEFITool/ffsops.cpp
index 35e4a7c..f3e7538 100644
--- a/UEFITool/ffsops.cpp
+++ b/UEFITool/ffsops.cpp
@@ -14,7 +14,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include "ffsops.h"
 
 FfsOperations::FfsOperations(const TreeModel* treeModel, QObject *parent)
-    : model(treeModel), QObject(parent)
+    : QObject(parent), model(treeModel)
 {
 }
 
diff --git a/UEFITool/ffsops.h b/UEFITool/ffsops.h
index c6c16c2..8693348 100644
--- a/UEFITool/ffsops.h
+++ b/UEFITool/ffsops.h
@@ -19,10 +19,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <QString>
 #include <QModelIndex>
 
-#include "..\common\basetypes.h"
-#include "..\common\treemodel.h"
-#include "..\common\ffs.h"
-#include "..\common\utility.h"
+#include "../common/basetypes.h"
+#include "../common/treemodel.h"
+#include "../common/ffs.h"
+#include "../common/utility.h"
 
 class FfsOperations : public QObject
 {
diff --git a/UEFITool/uefitool.h b/UEFITool/uefitool.h
index 9472051..e996b93 100644
--- a/UEFITool/uefitool.h
+++ b/UEFITool/uefitool.h
@@ -33,10 +33,10 @@
 #include <QTreeView>
 #include <QUrl>
 
-#include "..\common\basetypes.h"
-#include "..\common\utility.h"
-#include "..\common\ffs.h"
-#include "..\common\ffsparser.h"
+#include "../common/basetypes.h"
+#include "../common/utility.h"
+#include "../common/ffs.h"
+#include "../common/ffsparser.h"
 #include "searchdialog.h"
 #include "messagelistitem.h"
 #include "ffsfinder.h"
diff --git a/common/ffsparser.cpp b/common/ffsparser.cpp
index f56643c..c443218 100644
--- a/common/ffsparser.cpp
+++ b/common/ffsparser.cpp
@@ -21,7 +21,7 @@ WITHWARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include "me.h"
 
 FfsParser::FfsParser(TreeModel* treeModel, QObject *parent)
-    : model(treeModel), QObject(parent)
+    : QObject(parent), model(treeModel)
 {
 }
 
@@ -1785,7 +1785,7 @@ STATUS FfsParser::parseCompressedSectionBody(const QModelIndex & index)
     }
     
     // Check reported uncompressed size
-    if (pdata.section.compressed.uncompressedSize != decompressed.size()) {
+    if (pdata.section.compressed.uncompressedSize != (UINT32)decompressed.size()) {
         msg(tr("parseCompressedSectionBody: decompressed size stored in header %1h (%2) differs from actual %3h (%4)")
             .hexarg(pdata.section.compressed.uncompressedSize)
             .arg(pdata.section.compressed.uncompressedSize)
diff --git a/common/ffsparser.h b/common/ffsparser.h
index 4bfd89b..2229421 100644
--- a/common/ffsparser.h
+++ b/common/ffsparser.h
@@ -61,7 +61,7 @@ private:
     TreeModel *model;
     QVector<QPair<QString, QModelIndex> > messagesVector;
 
-    STATUS parseIntelImage(const QByteArray & intelImage, const QModelIndex & parent, QModelIndex & root = QModelIndex());
+    STATUS parseIntelImage(const QByteArray & intelImage, const QModelIndex & parent, QModelIndex & root);
     STATUS parseGbeRegion(const QByteArray & gbe, const UINT32 parentOffset, const QModelIndex & parent, QModelIndex & index);
     STATUS parseMeRegion(const QByteArray & me, const UINT32 parentOffset, const QModelIndex & parent, QModelIndex & index);
     STATUS parseBiosRegion(const QByteArray & bios, const UINT32 parentOffset, const QModelIndex & parent, QModelIndex & index);