diff --git a/ocs-url.pro b/ocs-url.pro
index 1eae938370f186db79ebccd51be7bcfc38587d4f..304f58312d14899c2ebb61db8a5e42a184492c6f 100644
--- a/ocs-url.pro
+++ b/ocs-url.pro
@@ -24,8 +24,8 @@ DISTFILES += \
     pkg/snap/setup/gui/ocs-url.desktop \
     pkg/appimage/appimage-desktopintegration
 
-include(deployment.pri)
-
 include(src/lib/qtlib/qtlib.pri)
 
 include(src/app/app.pri)
+
+include(deployment.pri)
diff --git a/pkg/arch/PKGBUILD b/pkg/arch/PKGBUILD
index e5157d41f428313d9a07c3deeaa00fc6c837c4f2..04e23f275e04ffdf9b44600930c9e61862c444d4 100644
--- a/pkg/arch/PKGBUILD
+++ b/pkg/arch/PKGBUILD
@@ -15,7 +15,7 @@ md5sums=() #autofill using updpkgsums
 build() {
     #cd "${pkgname}-release-${pkgver}"
     cd "${pkgname}"
-    qmake PREFIX='/usr'
+    qmake PREFIX="/usr"
     make
 }
 
diff --git a/pkg/fedora/ocs-url.spec b/pkg/fedora/ocs-url.spec
index aeae496e92aea1f78a98f9b06e47f263b9bcb892..7c4a226789ad59ab91bf47494234989fd2013c9b 100644
--- a/pkg/fedora/ocs-url.spec
+++ b/pkg/fedora/ocs-url.spec
@@ -21,7 +21,7 @@ An install helper program for desktop stuff.
 
 %build
 %define debug_package %{nil}
-qmake-qt5 PREFIX='/usr'
+qmake-qt5 PREFIX="/usr"
 make
 
 %install
diff --git a/pkg/snap/snapcraft.yaml b/pkg/snap/snapcraft.yaml
index 89828dce9a2e349754a2f6502baa54a5e7d51d4d..a4292c44b5012330dca3be3f764d4b5821c9ab79 100644
--- a/pkg/snap/snapcraft.yaml
+++ b/pkg/snap/snapcraft.yaml
@@ -15,7 +15,7 @@ parts:
     source: ../../
     qt-version: qt5
     options:
-      - PREFIX='/usr'
+      - PREFIX="/usr"
     build-packages:
       - build-essential
       - qt5-default
diff --git a/pkg/ubuntu/debian/rules b/pkg/ubuntu/debian/rules
index 05dde7094a4e5c38332cccc8ca8c2f7b65eb1cd1..3fc604ca255505614239a3ba2f7f82d0071c3592 100755
--- a/pkg/ubuntu/debian/rules
+++ b/pkg/ubuntu/debian/rules
@@ -4,7 +4,7 @@
 	dh $@
 
 override_dh_auto_configure:
-	qmake PREFIX='/usr'
+	qmake PREFIX="/usr"
 
 override_dh_auto_install:
 	make INSTALL_ROOT="$(CURDIR)/debian/tmp" install
diff --git a/src/app/main.cpp b/src/app/main.cpp
index 3d60d070f588692b962a01fb09bc62a12598bd6a..91d81a3202d9d734fd17ccf78b440f4bd45032a0 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -1,10 +1,8 @@
-//#include <QtGlobal>
 #include <QString>
 #include <QStringList>
 #include <QUrl>
 #include <QJsonObject>
 #include <QCommandLineParser>
-//#include <QCoreApplication>
 #include <QGuiApplication>
 #include <QIcon>
 #include <QQmlApplicationEngine>
@@ -17,9 +15,6 @@
 int main(int argc, char *argv[])
 {
     // Init
-//#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
-//    QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-//#endif
     QGuiApplication app(argc, argv);
 
     qtlib::Config config(":/configs");