diff --git a/code/game/machinery/Freezer.dm b/code/game/machinery/Freezer.dm
index 0c644a60234..53b3d7d6c5d 100644
--- a/code/game/machinery/Freezer.dm
+++ b/code/game/machinery/Freezer.dm
@@ -98,6 +98,8 @@
 	data["gasPressure"] = round(air_contents.return_pressure())
 	data["gasTemperature"] = round(air_contents.temperature)
 	data["gasTemperatureCelsius"] = round(air_contents.temperature - T0C)
+	if(air_contents.total_moles == 0 && air_contents.temperature == 0)
+		data["gasTemperatureCelsius"] = 0
 	data["minGasTemperature"] = round(min_temperature)
 	data["maxGasTemperature"] = round(T20C)
 	data["targetGasTemperature"] = round(current_temperature)
@@ -252,9 +254,13 @@
 	data["on"] = on ? 1 : 0
 	data["gasPressure"] = round(air_contents.return_pressure())
 	data["gasTemperature"] = round(air_contents.temperature)
+	data["gasTemperatureCelsius"] = round(air_contents.temperature - T0C)
+	if(air_contents.total_moles == 0 && air_contents.temperature == 0)
+		data["gasTemperatureCelsius"] = 0
 	data["minGasTemperature"] = round(T20C)
 	data["maxGasTemperature"] = round(T20C+max_temperature)
 	data["targetGasTemperature"] = round(current_temperature)
+	data["targetGasTemperatureCelsius"] = round(current_temperature - T0C)
 	
 	var/temp_class = "normal"
 	if (air_contents.temperature > (T20C+40))
@@ -266,7 +272,7 @@
 	if (!ui)
 		// the ui does not exist, so we'll create a new() one
         // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm
-		ui = new(user, src, ui_key, "freezer.tmpl", "Gas Heating System", 440, 300)
+		ui = new(user, src, ui_key, "freezer.tmpl", "Gas Heating System", 520, 300)
 		// when the ui is first opened this is the data it will use
 		ui.set_initial_data(data)
 		// open the new ui window
diff --git a/code/game/machinery/computer/ai_core.dm b/code/game/machinery/computer/ai_core.dm
index 99751ab3296..d1187d27b7f 100644
--- a/code/game/machinery/computer/ai_core.dm
+++ b/code/game/machinery/computer/ai_core.dm
@@ -174,6 +174,9 @@
 	icon_state = "ai-empty"
 	anchored = 1
 	state = 20//So it doesn't interact based on the above. Not really necessary.
+	
+/obj/structure/AIcore/deactivated/Destroy()
+	empty_playable_ai_cores -= src	
 
 /obj/structure/AIcore/deactivated/attackby(var/obj/item/W, var/mob/user)
 	if(istype(W, /obj/item/device/aicard))//Is it?
diff --git a/nano/templates/freezer.tmpl b/nano/templates/freezer.tmpl
index 7e36e008819..459b59917cf 100644
--- a/nano/templates/freezer.tmpl
+++ b/nano/templates/freezer.tmpl
@@ -39,7 +39,7 @@
 			{{:helper.link('-', null, {'temp' : -100}, (data.targetGasTemperature > data.minGasTemperature) ? null : 'disabled')}}
 			{{:helper.link('-', null, {'temp' : -10}, (data.targetGasTemperature > data.minGasTemperature) ? null : 'disabled')}}
 			{{:helper.link('-', null, {'temp' : -1}, (data.targetGasTemperature > data.minGasTemperature) ? null : 'disabled')}}				
-			<div style="float: left; width: 110px; text-align: center;">&nbsp;{{:data.targetGasTemperature}} K&nbsp; ({{:data.targetGasTemperatureCelsius}} &deg;C)</div>
+			<div style="float: left; width: 110px; text-align: center;">{{:data.targetGasTemperature}} K  ({{:data.targetGasTemperatureCelsius}} &deg;C)</div>
 			{{:helper.link('+', null, {'temp' : 1}, (data.targetGasTemperature < data.maxGasTemperature) ? null : 'disabled')}}
 			{{:helper.link('+', null, {'temp' : 10}, (data.targetGasTemperature < data.maxGasTemperature) ? null : 'disabled')}}
 			{{:helper.link('+', null, {'temp' : 100}, (data.targetGasTemperature < data.maxGasTemperature) ? null : 'disabled')}}