diff --git a/generators/lua.js b/generators/lua.js
index 885e77c23..a1265b669 100644
--- a/generators/lua.js
+++ b/generators/lua.js
@@ -45,7 +45,7 @@ Blockly.Lua = new Blockly.Generator('Lua');
  */
 Blockly.Lua.addReservedWords(
     // Special character
-    '_' +
+    '_,' +
     // From theoriginalbit's script:
     // https://github.com/espertus/blockly-lua/issues/6
     '__inext,assert,bit,colors,colours,coroutine,disk,dofile,error,fs,' +
diff --git a/generators/lua/lists.js b/generators/lua/lists.js
index 91f2c9734..619f6d8d7 100644
--- a/generators/lua/lists.js
+++ b/generators/lua/lists.js
@@ -119,12 +119,12 @@ Blockly.Lua['lists_indexOf'] = function(block) {
  * @private
  * @param {string} listname Name of the list, used to calculate length.
  * @param {string} where The method of indexing, selected by dropdown in Blockly
- * @param {=string} opt_at The optional offset when indexing from start/end.
+ * @param {string=} opt_at The optional offset when indexing from start/end.
  * @return {string} Index expression.
  */
 Blockly.Lua.lists.getIndex_ = function(listname, where, opt_at) {
   if (where == 'FIRST') {
-    return 1;
+    return '1';
   } else if (where == 'FROM_END') {
     return '#' + listname + ' + 1 - ' + opt_at;
   } else if (where == 'LAST') {