diff --git a/Code/Tools/ProjectManager/Source/DownloadController.cpp b/Code/Tools/ProjectManager/Source/DownloadController.cpp
index e06763ed4d..4942f4efb0 100644
--- a/Code/Tools/ProjectManager/Source/DownloadController.cpp
+++ b/Code/Tools/ProjectManager/Source/DownloadController.cpp
@@ -8,11 +8,8 @@
 
 #include <DownloadController.h>
 #include <DownloadWorker.h>
-#include <ProjectButtonWidget.h>
 
 #include <QMessageBox>
-#include <QDesktopServices>
-#include <QUrl>
 
 
 namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/DownloadController.h b/Code/Tools/ProjectManager/Source/DownloadController.h
index a769533c72..2a377f1ce8 100644
--- a/Code/Tools/ProjectManager/Source/DownloadController.h
+++ b/Code/Tools/ProjectManager/Source/DownloadController.h
@@ -41,7 +41,14 @@ namespace O3DE::ProjectManager
 
         const QString& GetCurrentDownloadingGem() const
         {
-            return m_gemNames[0];
+            if (!m_gemNames.empty())
+            {
+                return m_gemNames[0];
+            }
+            else
+            {
+                return QString();
+            }
         }
     public slots:
         void Start();
diff --git a/Code/Tools/ProjectManager/Source/DownloadWorker.cpp b/Code/Tools/ProjectManager/Source/DownloadWorker.cpp
index 954eae432e..9bda1b34cc 100644
--- a/Code/Tools/ProjectManager/Source/DownloadWorker.cpp
+++ b/Code/Tools/ProjectManager/Source/DownloadWorker.cpp
@@ -10,10 +10,6 @@
 #include <DownloadWorker.h>
 #include <PythonBindings.h>
 
-#include <QMessageBox>
-#include <QDesktopServices>
-#include <QUrl>
-
 
 namespace O3DE::ProjectManager
 {
diff --git a/Code/Tools/ProjectManager/Source/DownloadWorker.h b/Code/Tools/ProjectManager/Source/DownloadWorker.h
index 1bd51bca66..316a730a78 100644
--- a/Code/Tools/ProjectManager/Source/DownloadWorker.h
+++ b/Code/Tools/ProjectManager/Source/DownloadWorker.h
@@ -17,8 +17,6 @@ namespace O3DE::ProjectManager
 {
     class DownloadWorker : public QObject
     {
-        // QProcess::waitForFinished uses -1 to indicate that the process should not timeout
-        static constexpr int MaxBuildTimeMSecs = -1;
         // Download was cancelled
         inline static const QString DownloadCancelled = QObject::tr("Download Cancelled.");
 
@@ -38,9 +36,6 @@ namespace O3DE::ProjectManager
 
     private:
 
-        QProcess* m_configProjectProcess = nullptr;
-        QProcess* m_buildProjectProcess = nullptr;
-
         QString m_gemName;
         int m_downloadProgress;
     };
diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogHeaderWidget.cpp b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogHeaderWidget.cpp
index 9396234a68..79ff7624b7 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogHeaderWidget.cpp
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogHeaderWidget.cpp
@@ -164,11 +164,11 @@ namespace O3DE::ProjectManager
         layout->setAlignment(Qt::AlignTop);
         widget->setLayout(layout);
 
-        QLabel* label = new QLabel();
-        label->setObjectName("GemCatalogCartOverlaySectionLabel");
-        layout->addWidget(label);
+        QLabel* titleLabel = new QLabel();
+        titleLabel->setObjectName("GemCatalogCartOverlaySectionLabel");
+        layout->addWidget(titleLabel);
 
-        label->setText(tr("Gems to be installed"));
+        titleLabel->setText(tr("Gems to be installed"));
 
         // Create header section
         QWidget* downloadingGemsWidget = new QWidget();