diff --git a/src/eval.c b/src/eval.c
index e2f40f0bce..3650c34a9b 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -5371,6 +5371,8 @@ eval_index(arg, rettv, evaluate, verbose)
     }
 #endif
 
+    init_tv(&var1);
+    init_tv(&var2);
     if (**arg == '.')
     {
 	/*
diff --git a/src/version.c b/src/version.c
index 1301f2bf2c..08d1140119 100644
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    836,
 /**/
     835,
 /**/