diff --git a/nw/gui/doceditor.py b/nw/gui/doceditor.py
index a06c3035..c665c6a2 100644
--- a/nw/gui/doceditor.py
+++ b/nw/gui/doceditor.py
@@ -455,7 +455,7 @@ class GuiDocEditor(QTextEdit):
         docChanged = self.docChanged
         if self.mainConf.scrollPastEnd:
             docFrame = self.qDocument.rootFrame().frameFormat()
-            docFrame.setBottomMargin(max(0, 0.6*(wH - uM - lM - 4*tB)))
+            docFrame.setBottomMargin(max(0, 0.9*(wH - uM - lM - 4*tB)))
             self.qDocument.rootFrame().setFrameFormat(docFrame)
 
         # This is needed as the setFrameFormat function itself will
@@ -847,7 +847,7 @@ class GuiDocEditor(QTextEdit):
             if okMod and okKey:
                 cNew = self.cursorRect().center().y()
                 cMov = cNew - cOld
-                mPos = self.mainConf.autoScrollPos * self.viewport().height() * 0.01
+                mPos = self.mainConf.autoScrollPos*0.01 * self.viewport().height()
                 if abs(cMov) > 0 and cOld > mPos:
                     # Move the scroll bar
                     vBar = self.verticalScrollBar()
diff --git a/setup/win_setup_pyz.iss b/setup/win_setup_pyz.iss
index f198bc22..6fdb17ce 100644
--- a/setup/win_setup_pyz.iss
+++ b/setup/win_setup_pyz.iss
@@ -27,7 +27,7 @@ UsedUserAreasWarning=no
 ;PrivilegesRequired=lowest
 PrivilegesRequiredOverridesAllowed=dialog
 OutputDir={#nwAppDir}
-OutputBaseFilename=novelwriter-{#nwAppVersion}-win10-amd64-setup
+OutputBaseFilename=novelwriter-{#nwAppVersion}-win10-amd64-pyz-setup
 Compression=lzma
 SolidCompression=yes
 WizardStyle=modern