diff --git a/Software/PC_Application/Calibration/amplitudecaldialog.cpp b/Software/PC_Application/Calibration/amplitudecaldialog.cpp
index 9425aa3..80912e6 100644
--- a/Software/PC_Application/Calibration/amplitudecaldialog.cpp
+++ b/Software/PC_Application/Calibration/amplitudecaldialog.cpp
@@ -25,7 +25,7 @@ AmplitudeCalDialog::AmplitudeCalDialog(Device *dev, ModeHandler *handler, QWidge
     model(this),
     mode(CalibrationMode::BothPorts)
 {
-    auto activeMode = modeHandler->getActiveMode();
+    activeMode = modeHandler->getActiveMode();
     modeHandler->deactivate(activeMode);
     dev->SetIdle();
     ui->setupUi(this);
@@ -138,7 +138,6 @@ AmplitudeCalDialog::AmplitudeCalDialog(Device *dev, ModeHandler *handler, QWidge
 AmplitudeCalDialog::~AmplitudeCalDialog()
 {
     delete ui;
-    auto activeMode = modeHandler->getActiveMode();
     modeHandler->activate(activeMode);
 }
 
diff --git a/Software/PC_Application/Calibration/amplitudecaldialog.h b/Software/PC_Application/Calibration/amplitudecaldialog.h
index d36516d..531983d 100644
--- a/Software/PC_Application/Calibration/amplitudecaldialog.h
+++ b/Software/PC_Application/Calibration/amplitudecaldialog.h
@@ -101,6 +101,7 @@ protected:
     std::vector<CorrectionPoint> points;
     Ui::AmplitudeCalDialog *ui;
     Device *dev;
+    Mode *activeMode;
     ModeHandler *modeHandler;
     AmplitudeModel model;
     bool edited;
diff --git a/Software/PC_Application/appwindow.cpp b/Software/PC_Application/appwindow.cpp
index 907e3a1..8bfa449 100644
--- a/Software/PC_Application/appwindow.cpp
+++ b/Software/PC_Application/appwindow.cpp
@@ -238,8 +238,8 @@ AppWindow::AppWindow(QWidget *parent)
     setCentralWidget(central);
 
     auto vnaIndex = modeHandler->createMode("Vector Network Analyzer", Mode::Type::VNA);
-    modeHandler->createMode("Spectrum Analyzer", Mode::Type::SA);
     modeHandler->createMode("Signal Generator", Mode::Type::SG);
+    modeHandler->createMode("Spectrum Analyzer", Mode::Type::SA);
     modeHandler->setCurrentIndex(vnaIndex);
 
     auto setModeStatusbar = [=](const QString &msg) {
diff --git a/Software/PC_Application/modewindow.cpp b/Software/PC_Application/modewindow.cpp
index 1fe89d4..447c739 100644
--- a/Software/PC_Application/modewindow.cpp
+++ b/Software/PC_Application/modewindow.cpp
@@ -8,8 +8,8 @@
 #include <QPushButton>
 #include <QMenuBar>
 
-ModeWindow::ModeWindow(ModeHandler* handler, AppWindow* aw, QWidget* parent):
-    QWidget(parent),
+ModeWindow::ModeWindow(ModeHandler* handler, AppWindow* aw):
+    QWidget(aw),
     handler(handler),
     aw(aw)
 {
diff --git a/Software/PC_Application/modewindow.h b/Software/PC_Application/modewindow.h
index c4a8139..842f20e 100644
--- a/Software/PC_Application/modewindow.h
+++ b/Software/PC_Application/modewindow.h
@@ -7,7 +7,7 @@ class ModeWindow: public QWidget
 {
     Q_OBJECT
 public:
-    explicit ModeWindow(ModeHandler* handler, AppWindow* aw, QWidget *parent = nullptr);
+    explicit ModeWindow(ModeHandler* handler, AppWindow* aw);
     ~ModeWindow();
 
 private: