diff --git a/.travis.yml b/.travis.yml
index 53b840c3..f8e394c7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,6 +23,10 @@ matrix:
             - libusb-1.0-0-dev
       env:
         - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
+    - os: osx
+      osx_image: xcode11.6
+      compiler: clang
+
 
 before_install:
   - eval "${MATRIX_EVAL}"
diff --git a/Desktop_Interface/Labrador.pro b/Desktop_Interface/Labrador.pro
index 2926d90a..7d3ee410 100644
--- a/Desktop_Interface/Labrador.pro
+++ b/Desktop_Interface/Labrador.pro
@@ -359,6 +359,4 @@ DISTFILES += \
 # Vincenzo added these to get multithreading on Unix fftw
 unix: LIBS += -lomp
 unix: LIBS += -lfftw3f_omp
-unix: LIBS += -lfftw3_threads
-macx: INCLUDEPATH += /usr/local/include
-macx: LIBS+= -L/usr/local/lib
+unix: LIBS += -lfftw3_threads
\ No newline at end of file
diff --git a/Desktop_Interface/macrun b/Desktop_Interface/macrun
index 9d8845ee..116a5a17 100755
--- a/Desktop_Interface/macrun
+++ b/Desktop_Interface/macrun
@@ -1,4 +1,4 @@
-qmake
+qmake "INCLUDEPATH += /usr/local/include" "LIBS+= -L/usr/local/lib"
 make -j$(sysctl -n hw.physicalcpu)
 cp -R ./bin/waveforms ./bin/Labrador.app/Contents/MacOS
 cp -R ./bin/firmware ./bin/Labrador.app/Contents/MacOS
diff --git a/Desktop_Interface/mainwindow.cpp b/Desktop_Interface/mainwindow.cpp
index e8c3f695..6132cf74 100644
--- a/Desktop_Interface/mainwindow.cpp
+++ b/Desktop_Interface/mainwindow.cpp
@@ -251,7 +251,7 @@ MainWindow::MainWindow(QWidget *parent) :
     spectrumMinXSpinbox = new QSpinBox();
     spectrumMaxXSpinbox = new QSpinBox();
     spectrumLayoutWidget = new QWidget();
-    QHBoxLayout* spectrumLayout = new QHBoxLayout();
+    QHBoxLayout* spectrumLayout = new QHBoxLayout(spectrumLayoutWidget);
     QLabel* spectrumMinFreqLabel = new QLabel("Min Frequency (Hz)");
     QLabel* spectrumMaxFreqLabel = new QLabel("Max Frequency (Hz)");
     QSpacerItem* spacer = new QSpacerItem(20, 40, QSizePolicy::Expanding, QSizePolicy::Minimum);
@@ -283,7 +283,7 @@ MainWindow::MainWindow(QWidget *parent) :
 
 MainWindow::~MainWindow()
 {
-    delete ui;
+    // delete ui;
 }
 
 void MainWindow::initialisePlot()