diff --git a/src/version.c b/src/version.c
index 6bd68dc..a8e0151 100644
--- a/src/version.c
+++ b/src/version.c
@@ -700,6 +700,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    504,
+/**/
     503,
 /**/
     502,
diff --git a/src/vim9execute.c b/src/vim9execute.c
index c1c2e12..51c5420 100644
--- a/src/vim9execute.c
+++ b/src/vim9execute.c
@@ -5955,13 +5955,13 @@
 	if (ga_grow(&ga, 50) == FAIL)
 	    break;
 	if (lvi->lvi_loop[depth].var_idx == 0)
-	    STRCPY(ga.ga_data + ga.ga_len, " -");
+	    STRCPY((char *)ga.ga_data + ga.ga_len, " -");
 	else
-	    vim_snprintf(ga.ga_data + ga.ga_len, 50, " $%d-$%d",
+	    vim_snprintf((char *)ga.ga_data + ga.ga_len, 50, " $%d-$%d",
 			    lvi->lvi_loop[depth].var_idx,
 			    lvi->lvi_loop[depth].var_idx
 					 + lvi->lvi_loop[depth].var_count - 1);
-	ga.ga_len = STRLEN(ga.ga_data);
+	ga.ga_len = (int)STRLEN(ga.ga_data);
     }
     return ga.ga_data;
 }
diff --git a/src/vim9expr.c b/src/vim9expr.c
index 5f1e07d..0e44b76 100644
--- a/src/vim9expr.c
+++ b/src/vim9expr.c
@@ -496,6 +496,7 @@
 	int	    idx;
 	int	    gen_load = FALSE;
 	int	    gen_load_outer = 0;
+	int	    outer_loop_depth = -1;
 	int	    outer_loop_idx = -1;
 
 	name = vim_strnsave(*arg, end - *arg);
@@ -521,6 +522,7 @@
 	    {
 		type = lvar.lv_type;
 		idx = lvar.lv_idx;
+		outer_loop_depth = lvar.lv_loop_depth;
 		outer_loop_idx = lvar.lv_loop_idx;
 		if (lvar.lv_from_outer != 0)
 		    gen_load_outer = lvar.lv_from_outer;
@@ -546,8 +548,8 @@
 	    res = generate_LOAD(cctx, ISN_LOAD, idx, NULL, type);
 	if (gen_load_outer > 0)
 	{
-	    res = generate_LOADOUTER(cctx, idx,
-					 gen_load_outer, outer_loop_idx, type);
+	    res = generate_LOADOUTER(cctx, idx, gen_load_outer,
+				       outer_loop_depth, outer_loop_idx, type);
 	    cctx->ctx_outer_used = TRUE;
 	}
     }