diff --git a/common/lc_mainwindow.cpp b/common/lc_mainwindow.cpp
index 6e7a76e3..4235b80c 100644
--- a/common/lc_mainwindow.cpp
+++ b/common/lc_mainwindow.cpp
@@ -24,7 +24,7 @@
 #include "lc_colors.h"
 #include <functional>
 
-#define LC_ENABLE_GAMEPAD (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0))
+#define LC_ENABLE_GAMEPAD (QT_VERSION >= QT_VERSION_CHECK(5, 12, 0))
 
 #if LC_ENABLE_GAMEPAD
 #include <QtGamepad/QGamepad>
diff --git a/common/lc_texture.cpp b/common/lc_texture.cpp
index 25577dfa..6f534e73 100644
--- a/common/lc_texture.cpp
+++ b/common/lc_texture.cpp
@@ -220,7 +220,7 @@ void lcTexture::Upload(lcContext* Context)
 	int FilterIndex = FilterFlags >> LC_TEXTURE_FILTER_SHIFT;
 	int MipIndex = mFlags & LC_TEXTURE_MIPMAPS ? 0 : 1;
 
-	int Faces, Target;
+    unsigned int Faces, Target;
 
 	if ((mFlags & LC_TEXTURE_CUBEMAP) == 0)
 	{
@@ -273,7 +273,7 @@ void lcTexture::Upload(lcContext* Context)
 	if (mFlags & LC_TEXTURE_CUBEMAP)
 		Target = GL_TEXTURE_CUBE_MAP_POSITIVE_X;
 
-	for (int FaceIdx = 0; FaceIdx < Faces; FaceIdx++)
+    for (size_t FaceIdx = 0; FaceIdx < Faces; FaceIdx++)
 	{
 		void* Data = mImages[CurrentImage].mData;
 		glTexImage2D(Target, 0, Format, mWidth, mHeight, 0, Format, GL_UNSIGNED_BYTE, Data);
diff --git a/common/minifig.cpp b/common/minifig.cpp
index b617fda7..0a79f2c3 100644
--- a/common/minifig.cpp
+++ b/common/minifig.cpp
@@ -84,8 +84,6 @@ void MinifigWizard::OnInitialUpdate()
 	MakeCurrent();
 	mContext->SetDefaultState();
 
-	memset(&mMinifig, 0, sizeof(lcMinifig));
-
 	static_assert(sizeof(MinifigWizard::mSectionNames) / sizeof(MinifigWizard::mSectionNames[0]) == LC_MFW_NUMITEMS, "Array size mismatch.");
 
 	const int ColorCodes[LC_MFW_NUMITEMS] = { 4, 7, 14, 7, 1, 0, 7, 4, 4, 14, 14, 7, 7, 0, 0, 7, 7 };
@@ -95,13 +93,13 @@ void MinifigWizard::OnInitialUpdate()
 	for (int i = 0; i < LC_MFW_NUMITEMS; i++)
 	{
 		mMinifig.Colors[i] = lcGetColorIndex(ColorCodes[i]);
+        mMinifig.Angles[i] = 0.0f;
+        mMinifig.Matrices[i] = lcMatrix44Identity();
 
 		PieceInfo* Info = Library->FindPiece(Pieces[i], nullptr, false, false);
-		if (Info)
-		{
-			mMinifig.Parts[i] = Info;
+        mMinifig.Parts[i] = Info;
+        if (Info)
 			Library->LoadPieceInfo(Info, false, true);
-		}
 	}
 
 	Library->WaitForLoadQueue();
diff --git a/leocad.pro b/leocad.pro
index 5523e644..bfb485e3 100644
--- a/leocad.pro
+++ b/leocad.pro
@@ -7,7 +7,7 @@ greaterThan(QT_MAJOR_VERSION, 4) {
 }
 
 equals(QT_MAJOR_VERSION, 5) {
-    greaterThan(QT_MINOR_VERSION, 9) {
+    greaterThan(QT_MINOR_VERSION, 11) {
 		QT += gamepad
 	}
 }