diff --git a/aegisub/auto4_lua.cpp b/aegisub/auto4_lua.cpp
index 9d03a2557..5e422401e 100644
--- a/aegisub/auto4_lua.cpp
+++ b/aegisub/auto4_lua.cpp
@@ -41,6 +41,7 @@
 #include "ass_override.h"
 #include "text_file_reader.h"
 #include "options.h"
+#include "vfr.h"
 #include "../lua51/src/lualib.h"
 #include "../lua51/src/lauxlib.h"
 #include <wx/msgdlg.h>
diff --git a/aegisub/auto4_ruby_assfile.cpp b/aegisub/auto4_ruby_assfile.cpp
index 869af71c6..4c2ad4683 100644
--- a/aegisub/auto4_ruby_assfile.cpp
+++ b/aegisub/auto4_ruby_assfile.cpp
@@ -379,7 +379,10 @@ namespace Automation4 {
 				rb_set_errinfo(Qnil);
 			}
 		}
-		AssFile::top->FlagAsModified(_T(""));
+
+		if (can_set_undo) {
+			AssFile::top->FlagAsModified(_T(""));
+		}
 	}
 	
 	int RubyAssFile::RubyParseTagData()
@@ -397,6 +400,11 @@ namespace Automation4 {
 
 	int RubyAssFile::RubySetUndoPoint()
 	{
+		// I can think of two things to do here:
+		// One is to read in all of the subs from Ruby and cobvert back to AssEntry, inserting it into the file, then set undo point
+		// Another is to just scrap it and only support one undo point per macro execution, and simply save the message, using it
+		// to set the description when the actual undo point it set after execution.
+		//  -jfs
 		return 0;
 	}