diff --git a/Makefile b/Makefile
index 3f42739b6b6729a0f8916fa9a79308fae1a9fab0..263df1a31b7e8b60887d126b25e1d51ad8a2de4e 100644
--- a/Makefile
+++ b/Makefile
@@ -206,10 +206,10 @@ ifeq (${PLATFORM}, darwin)
 	@cp build/bin/${PLATFORM}/bitmask-helper ${INST_DATA}/
 ifeq (${RELEASE}, yes)
 	@echo "[+] Running macdeployqt (release mode)"
-	@macdeployqt ${QTBUILD}/release/${PROVIDER}-vpn.app -qmldir=gui/qml ${MACDEPLOYQT_OPTS}
+	@macdeployqt ${QTBUILD}/release/${PROVIDER}-vpn.app -qmldir=gui/components ${MACDEPLOYQT_OPTS}
 else
 	@echo "[+] Running macdeployqt (debug mode)"
-	@macdeployqt ${QTBUILD}/release/${PROVIDER}-vpn.app -qmldir=gui/qml
+	@macdeployqt ${QTBUILD}/release/${PROVIDER}-vpn.app -qmldir=gui/components
 endif
 	@cp -r "${QTBUILD}/release/${TARGET}.app"/ ${INST_DATA}/
 endif
diff --git a/branding/scripts/gen-qtinstaller b/branding/scripts/gen-qtinstaller
index 9be097d6f2151e93d4403a55617271aee56e0ac0..5b4d103d4e778bfaa345d9f7159af5ab4d0c4a6e 100755
--- a/branding/scripts/gen-qtinstaller
+++ b/branding/scripts/gen-qtinstaller
@@ -8,7 +8,7 @@ import time
 
 from string import Template
 
-from provider import getDefaultProvider
+from provider import getDefaultProviders
 from provider import getProviderData
 
 OS_CONFIG = {
@@ -46,7 +46,7 @@ def getData():
 
     provider = os.environ.get('PROVIDER')
     if not provider:
-        provider = getDefaultProvider(config)
+        provider = getDefaultProviders(config)[0]
     return getProviderData(provider, config)
 
 def generateQtInstallerBoilerplate(data, platform, outDir):