diff --git a/comfy/controlnet.py b/comfy/controlnet.py
index 37914e5fe..1d24afa6f 100644
--- a/comfy/controlnet.py
+++ b/comfy/controlnet.py
@@ -237,6 +237,7 @@ class ControlNet(ControlBase):
             if len(self.extra_concat_orig) > 0:
                 to_concat = []
                 for c in self.extra_concat_orig:
+                    c = c.to(self.cond_hint.device)
                     c = comfy.utils.common_upscale(c, self.cond_hint.shape[3], self.cond_hint.shape[2], self.upscale_algorithm, "center")
                     to_concat.append(comfy.utils.repeat_to_batch_size(c, self.cond_hint.shape[0]))
                 self.cond_hint = torch.cat([self.cond_hint] + to_concat, dim=1)
diff --git a/comfy/sd.py b/comfy/sd.py
index 97d6b2e95..67b4ff0cf 100644
--- a/comfy/sd.py
+++ b/comfy/sd.py
@@ -584,7 +584,7 @@ def load_state_dict_guess_config(sd, output_vae=True, output_clip=True, output_c
         unet_weight_dtype.append(weight_dtype)
 
     model_config.custom_operations = model_options.get("custom_operations", None)
-    unet_dtype = model_options.get("weight_dtype", None)
+    unet_dtype = model_options.get("dtype", model_options.get("weight_dtype", None))
 
     if unet_dtype is None:
         unet_dtype = model_management.unet_dtype(model_params=parameters, supported_dtypes=unet_weight_dtype)