diff --git a/code/datums/components/_component.dm b/code/datums/components/_component.dm
index bb60350cbf..0c85ddd871 100644
--- a/code/datums/components/_component.dm
+++ b/code/datums/components/_component.dm
@@ -137,10 +137,14 @@
 	return
 
 /datum/component/proc/_GetInverseTypeList(our_type = type)
-#if DM_VERSION > 511
-#warning Remove this hack for http://www.byond.com/forum/?post=73469
-#endif
+	#if DM_VERSION >= 513
+	#warning 512 is definitely stable now, remove the old code
+	#endif
+
+	#if DM_VERSION < 512
+	//remove this when we use 512 full time
 	set invisibility = 101
+	#endif
 	//we can do this one simple trick
 	var/current_type = parent_type
 	. = list(our_type, current_type)
diff --git a/code/game/machinery/_machinery.dm b/code/game/machinery/_machinery.dm
index 286bcee1f8..945d414382 100644
--- a/code/game/machinery/_machinery.dm
+++ b/code/game/machinery/_machinery.dm
@@ -509,11 +509,16 @@ Class Procs:
 
 /obj/machinery/proc/adjust_item_drop_location(atom/movable/AM)	// Adjust item drop location to a 3x3 grid inside the tile, returns slot id from 0 to 8
 	var/md5 = md5(AM.name)										// Oh, and it's deterministic too. A specific item will always drop from the same slot.
-#if DM_VERSION > 511
-#warn Refactor the loop in /obj/machinery/proc/adjust_item_drop_location() to make use of 512's list-like access to characters in a string
-#endif
 	for (var/i in 1 to 32)
+		#if DM_VERSION >= 513
+		#warning 512 is definitely stable now, remove the old code
+		#endif
+		
+		#if DM_VERSION >= 512
+		. += hex2num(md5[i])
+		#else
 		. += hex2num(copytext(md5,i,i+1))
+		#endif
 	. = . % 9
 	AM.pixel_x = -8 + ((.%3)*8)
 	AM.pixel_y = -8 + (round( . / 3)*8)
\ No newline at end of file
diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm
index 7c764e26cb..434996fb08 100644
--- a/code/modules/reagents/chemistry/machinery/chem_master.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_master.dm
@@ -344,11 +344,16 @@
 		return null
 	else
 		var/md5 = md5(AM.name)
-#if DM_VERSION > 511
-#warn Refactor the loop in /obj/machinery/chem_master/adjust_item_drop_location() to make use of 512's list-like access to characters in a string
-#endif
 		for (var/i in 1 to 32)
+			#if DM_VERSION >= 513
+			#warning 512 is definitely stable now, remove the old code
+			#endif
+			
+			#if DM_VERSION >= 512
+			. += hex2num(md5[i])
+			#else
 			. += hex2num(copytext(md5,i,i+1))
+			#endif
 		. = . % 9
 		AM.pixel_x = ((.%3)*6)
 		AM.pixel_y = -8 + (round( . / 3)*8)