diff --git a/doc/atcommands.txt b/doc/atcommands.txt
index c13d73ff7d..daa2753641 100644
--- a/doc/atcommands.txt
+++ b/doc/atcommands.txt
@@ -1421,7 +1421,7 @@ Affected files:
 -- questdb: quest_db.yml
 -- script: /npc/*.txt, /npc/*.conf
 -- skilldb: skill_db.yml, const.txt, skill_nocast_db.txt, skill_changematerial_db.txt, skill_damage_db.txt, abra_db.yml, create_arrow_db.txt, produce_db.txt, spellbook_db.yml, magicmushroom_db.yml
--- statusdb: attr_fix.txt, size_fix.yml, refine_db.txt
+-- statusdb: attr_fix.txt, size_fix.yml, refine.yml
 -- achievementdb: achievement_db.yml
 -- attendancedb: attendance.yml
 
diff --git a/npc/merchants/refine.txt b/npc/merchants/refine.txt
index ae18c7c816..d2ee55bfe9 100644
--- a/npc/merchants/refine.txt
+++ b/npc/merchants/refine.txt
@@ -627,7 +627,7 @@ lhz_in02,282,20,7	script	Fulerr	4_M_LGTMAN,{
 //= To allow auto safe refining/multiple refining set the
 //= second argument to '1' in the function call.
 //= If you enable this function, be sure to edit the value of
-//= .@safe to the max safe refine in refine_db.txt as well.
+//= .@safe to the max safe refine in refine_db.yml as well.
 //============================================================
 function	script	refinemain	{
 	disable_items;
diff --git a/npc/re/merchants/refine.txt b/npc/re/merchants/refine.txt
index e6a5e7ac24..0e26f236ba 100644
--- a/npc/re/merchants/refine.txt
+++ b/npc/re/merchants/refine.txt
@@ -43,7 +43,7 @@ payon_in01,18,132,3	duplicate(Vestri#prt)	Vestri#pay	4_M_DWARF
 //= To allow auto safe refining/multiple refining set the
 //= second argument to '1' in the function call.
 //= If you enable this function, be sure to edit the value of
-//= .@safe to the max safe refine in refine_db.txt as well.
+//= .@safe to the max safe refine in refine_db.yml as well.
 //=
 //= On official servers, if an item is unsuccessfully refined
 //= it will break at a 20% rate and downgrade at an 80% rate.
diff --git a/src/map/pc.cpp b/src/map/pc.cpp
index 4e343f6383..1be5272461 100755
--- a/src/map/pc.cpp
+++ b/src/map/pc.cpp
@@ -6048,6 +6048,7 @@ enum e_setpos pc_setpos(struct map_session_data* sd, unsigned short mapindex, in
 	sd->state.warping = 1;
 	sd->state.workinprogress = WIP_DISABLE_NONE;
 	sd->state.mail_writing = false;
+	sd->state.refineui_open = false;
 
 	if( sd->state.changemap ) { // Misc map-changing settings
 		int curr_map_instance_id = map_getmapdata(sd->bl.m)->instance_id, new_map_instance_id = (mapdata ? mapdata->instance_id : 0);
diff --git a/src/map/status.cpp b/src/map/status.cpp
index d23ba0d77a..6be3a1b03c 100644
--- a/src/map/status.cpp
+++ b/src/map/status.cpp
@@ -15980,7 +15980,7 @@ static bool status_readdb_attrfix(const char *basedir,bool silent)
  * DBs being read:
  *	attr_fix.txt: Attribute adjustment table for attacks
  *	size_fix.yml: Size adjustment table for weapons
- *	refine_db.txt: Refining data table
+ *	refine_db.yml: Refining data table
  * @return 0
  */
 int status_readdb( bool reload ){
diff --git a/src/map/status.hpp b/src/map/status.hpp
index 23ef0f3444..634db44b8e 100644
--- a/src/map/status.hpp
+++ b/src/map/status.hpp
@@ -22,7 +22,6 @@ struct status_change;
 
 /**
  * Max Refine available to your server
- * Changing this limit requires edits to refine_db.txt
  **/
 #ifdef RENEWAL
 #	define MAX_REFINE 20