diff --git a/library/Core.cpp b/library/Core.cpp
index e6056c62e..1a72e097d 100644
--- a/library/Core.cpp
+++ b/library/Core.cpp
@@ -73,7 +73,6 @@ using namespace DFHack;
 #include "df/viewscreen_loadgamest.h"
 #include "df/viewscreen_new_regionst.h"
 #include "df/viewscreen_savegamest.h"
-#include "df/viewscreen_optionst.h"
 #include <df/graphic.h>
 
 #include <stdio.h>
@@ -2041,7 +2040,7 @@ void Core::doUpdate(color_ostream &out, bool first_update)
     // Execute per-frame handlers
     onUpdate(out);
 
-    if (df::global::ui->main.autosave_request || strict_virtual_cast<df::viewscreen_optionst>(screen))
+    if (df::global::ui->main.autosave_request || strict_virtual_cast<df::viewscreen_savegamest>(screen))
     {
         doSave(out);
     }
diff --git a/library/include/modules/Persistence.h b/library/include/modules/Persistence.h
index 3431bee55..11f959698 100644
--- a/library/include/modules/Persistence.h
+++ b/library/include/modules/Persistence.h
@@ -52,6 +52,7 @@ namespace DFHack
     class DFHACK_EXPORT PersistentDataItem {
         size_t index;
         std::shared_ptr<Persistence::LegacyData> data;
+
     public:
         static const int NumInts = 7;