diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index 54590134d2..1a5ebf17e0 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -352,7 +352,11 @@ GLOBAL_LIST_EMPTY(electrochromatic_window_lookup)
 /obj/structure/window/update_atom_colour()
 	if((electrochromatic_status != ELECTROCHROMATIC_OFF) && (electrochromatic_status != ELECTROCHROMATIC_DIMMED))
 		return FALSE
-	return ..()
+	. = ..()
+	if(color_hex2num(color) < 255)
+		set_opacity(255)
+	else
+		set_opacity(FALSE)
 
 /obj/structure/window/proc/check_state(checked_state)
 	if(state == checked_state)
diff --git a/code/modules/assembly/doorcontrol.dm b/code/modules/assembly/doorcontrol.dm
index 1b9e63abaa..6016fd6453 100644
--- a/code/modules/assembly/doorcontrol.dm
+++ b/code/modules/assembly/doorcontrol.dm
@@ -34,7 +34,7 @@
 		return
 	var/new_id
 	if(id_is_number)
-		new_id = input(user, "Set ID (number)", "Set ID", show_id? id : null) as number|null
+		new_id = input(user, "Set ID (number)", "Set ID", show_id? id : null) as num|null
 	else
 		new_id = input(user, "Set ID", "Set ID", show_id? id : null) as text|null
 	if(!isnull(new_id))		//0/"" is considered !, so check null instead of just !.