diff --git a/YACReader/options_dialog.cpp b/YACReader/options_dialog.cpp
index 559b044a..f9eec307 100644
--- a/YACReader/options_dialog.cpp
+++ b/YACReader/options_dialog.cpp
@@ -11,6 +11,7 @@
 #include <QPushButton>
 #include <QLabel>
 #include <QColorDialog>
+#include <QCheckBox>
 
 #include "yacreader_spin_slider_widget.h"
 #include "yacreader_flow_config_widget.h"
@@ -104,7 +105,7 @@ OptionsDialog::OptionsDialog(QWidget * parent)
 	gammaS->setTracking(false);
 	connect(gammaS,SIGNAL(valueChanged(int)),this,SLOT(gammaChanged(int)));
 	//connect(brightnessS,SIGNAL(valueChanged(int)),this,SIGNAL(changedOptions()));
-	
+
     quickNavi = new QCheckBox(tr("Quick Navigation Mode"));
     disableShowOnMouseOver = new QCheckBox(tr("Disable mouse over activation"));
 
diff --git a/YACReaderLibrary/comic_vine/api_key_dialog.cpp b/YACReaderLibrary/comic_vine/api_key_dialog.cpp
index 0e1b326b..81b99e0f 100644
--- a/YACReaderLibrary/comic_vine/api_key_dialog.cpp
+++ b/YACReaderLibrary/comic_vine/api_key_dialog.cpp
@@ -63,6 +63,6 @@ void ApiKeyDialog::enableAccept(const QString &text)
 
 void ApiKeyDialog::saveApiKey()
 {
-    settings->setValue(COMIC_VINE_API_KEY,edit->text());
+    settings->setValue(COMIC_VINE_API_KEY,edit->text().trimmed());
     accept();
 }
diff --git a/YACReaderLibrary/options_dialog.cpp b/YACReaderLibrary/options_dialog.cpp
index 1bf6060a..f3baf23c 100644
--- a/YACReaderLibrary/options_dialog.cpp
+++ b/YACReaderLibrary/options_dialog.cpp
@@ -7,8 +7,9 @@
 #include "yacreader_flow_config_widget.h"
 #include "api_key_dialog.h"
 
-
+#ifndef NO_OPENGL
 FlowType flowType = Strip;
+#endif
 
 OptionsDialog::OptionsDialog(QWidget * parent)
 :YACReaderOptionsDialog(parent)
diff --git a/compressed_archive/unarr/unarr-wrapper.pri b/compressed_archive/unarr/unarr-wrapper.pri
index 56cfe401..9e6a53b9 100644
--- a/compressed_archive/unarr/unarr-wrapper.pri
+++ b/compressed_archive/unarr/unarr-wrapper.pri
@@ -6,19 +6,17 @@ HEADERS += $$PWD/extract_delegate.h \
 
 SOURCES += $$PWD/compressed_archive.cpp
 
-unix:!macx {
-    !contains(QT_CONFIG, no-pkg-config):packagesExist(libunarr) {
-      message(Using system provided unarr installation found by pkg-config.)
-      CONFIG += link_pkgconfig
-      PKGCONFIG += libunarr
-      DEFINES += use_unarr
-      }
-    else:exists(/usr/include/unarr.h):exists(/usr/lib/libunarr.so) {
-      message(Using system provided unarr installation.)
-      LIBS += -lunarr
-      DEFINES += use_unarr
-    }
+unix:!macx:!contains(QT_CONFIG, no-pkg-config):packagesExist(libunarr) {
+  message(Using system provided unarr installation found by pkg-config.)
+  CONFIG += link_pkgconfig
+  PKGCONFIG += libunarr
+  DEFINES += use_unarr
   }
+else:unix:!macx:exists(/usr/include/unarr.h) {
+  message(Using system provided unarr installation.)
+  LIBS += -lunarr
+  DEFINES += use_unarr
+}
 
 else:macx:exists(../../dependencies/unarr/macx/libunarr.a) {
   message(Found prebuilt unarr library in dependencies directory.)
diff --git a/config.pri b/config.pri
index 2f6564a1..fd223f3b 100644
--- a/config.pri
+++ b/config.pri
@@ -27,7 +27,7 @@ lessThan(QT_VER_MIN, 3) {
 isEmpty(QMAKE_TARGET.arch) {
   QMAKE_TARGET.arch = $$QMAKE_HOST.arch
 }
-contains(QMAKE_TARGET.arch, arm.*) {
+contains(QMAKE_TARGET.arch, arm.*)|contains(QMAKE_TARGET.arch, aarch.*) {
   message("Building for ARM architecture. Disabling OpenGL coverflow ...")
   CONFIG += no_opengl
 }
diff --git a/dependencies/pdf_backend.pri b/dependencies/pdf_backend.pri
index f0f9e4e6..0851b0aa 100644
--- a/dependencies/pdf_backend.pri
+++ b/dependencies/pdf_backend.pri
@@ -22,10 +22,10 @@ CONFIG(pdfium) {
       message(Using system provided installation of libpdfium found by pkg-config.)
       CONFIG += link_pkgconfig
       PKGCONFIG += libpdfium
-    } else:exists(/usr/include/pdfium):exists(/usr/lib/libpdfium.so) {
+    } else:exists(/usr/include/pdfium) {
       message(Using libpdfium found at /usr/lib/pdfium)
       INCLUDEPATH += /usr/include/pdfium
-      LIBS += -L/usr/lib/pdfium -lpdfium
+      LIBS += -lpdfium
     } else {
       error(Could not find libpdfium.)
     }
@@ -58,10 +58,10 @@ CONFIG(poppler) {
       message("Using system provided installation of poppler-qt5 found by pkg-config.")
       CONFIG += link_pkgconfig
       PKGCONFIG += poppler-qt5
-    } else:!macx:exists(/usr/include/poppler/qt5):exists(/usr/lib/libpoppler-qt5) {
+    } else:!macx:exists(/usr/include/poppler/qt5) {
       message("Using system provided installation of poppler-qt5.")
       INCLUDEPATH  += /usr/include/poppler/qt5
-      LIBS += -L/usr/lib -lpoppler-qt5
+      LIBS += -lpoppler-qt5
     } else {
       error("Could not find poppler-qt5")
     }