diff --git a/code/__HELPERS/roundend.dm b/code/__HELPERS/roundend.dm
index 9c1dc969b48..bbf65c38b4e 100644
--- a/code/__HELPERS/roundend.dm
+++ b/code/__HELPERS/roundend.dm
@@ -377,7 +377,7 @@
  * the file will be overwritten at the end of each shift.
  */
 /datum/controller/subsystem/ticker/proc/log_roundend_report()
-	var/filename = "[GLOB.log_directory]/round_end_data.html"
+	var/roundend_file = file("[GLOB.log_directory]/round_end_data.html")
 	var/list/parts = list()
 	parts += "<div class='panel stationborder'>"
 	parts += GLOB.survivor_report
@@ -385,12 +385,12 @@
 	parts += GLOB.common_report
 	var/content = parts.Join()
 	//Log the rendered HTML in the round log directory
-	fdel(filename)
-	text2file(content, filename)
+	fdel(roundend_file)
+	WRITE_FILE(roundend_file, content)
 	//Place a copy in the root folder, to be overwritten each round.
-	filename = "data/server_last_roundend_report.html"
-	fdel(filename)
-	text2file(content, filename)
+	roundend_file = file("data/server_last_roundend_report.html")
+	fdel(roundend_file)
+	WRITE_FILE(roundend_file, content)
 
 /datum/controller/subsystem/ticker/proc/show_roundend_report(client/C, report_type = null)
 	var/datum/browser/roundend_report = new(C, "roundend")
@@ -405,7 +405,6 @@
 	else //report_type is null, so make a new report based on the current round and show that to the player
 		var/list/report_parts = list(personal_report(C), GLOB.common_report)
 		content = report_parts.Join()
-		remove_verb(C, /client/proc/show_previous_roundend_report)
 		fdel(filename)
 		text2file(content, filename)
 
diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
index a8c3886ce37..522ab631946 100644
--- a/code/modules/client/client_procs.dm
+++ b/code/modules/client/client_procs.dm
@@ -259,7 +259,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
 	if(fexists(roundend_report_file()))
 		add_verb(src, /client/proc/show_previous_roundend_report)
 
-	if(fexists("data/last_roundend/server_last_roundend_report.html"))
+	if(fexists("data/server_last_roundend_report.html"))
 		add_verb(src, /client/proc/show_servers_last_roundend_report)
 
 	var/full_version = "[byond_version].[byond_build ? byond_build : "xxx"]"