diff --git a/CRM/Case/Form/Activity/OpenCase.php b/CRM/Case/Form/Activity/OpenCase.php
index 37f794492e22..ed571d76f3ad 100644
--- a/CRM/Case/Form/Activity/OpenCase.php
+++ b/CRM/Case/Form/Activity/OpenCase.php
@@ -204,7 +204,6 @@ public static function buildQuickForm(&$form) {
         'type' => 'upload',
         'name' => ts('Save and New'),
         'subName' => 'new',
-        'submitOnce' => TRUE,
       ],
       [
         'type' => 'cancel',
diff --git a/bin/cli.class.php b/bin/cli.class.php
index aa609d308072..8cdcc9e8e7c1 100644
--- a/bin/cli.class.php
+++ b/bin/cli.class.php
@@ -146,7 +146,7 @@ private function _parseOptions() {
     // of this script
     array_shift($args);
 
-    while (list($k, $arg) = each($args)) {
+    foreach ($args as $k => $arg) {
       // sanitize all user input
       $arg = $this->_sanitize($arg);