diff --git a/src/command_events.cc b/src/command_events.cc
index cbb87f45..ad3fdccb 100644
--- a/src/command_events.cc
+++ b/src/command_events.cc
@@ -119,8 +119,8 @@ apply_on_ratio(int action, const torrent::Object& rawArgs) {
 
     rpc::call_command("d.set_ignore_commands", (int64_t)1, rpc::make_target(*itr));
 
-    while (argItr != args.end())
-      rpc::parse_command_object(rpc::make_target(*itr), *(argItr++));
+    for (torrent::Object::list_type::const_iterator itr2 = argItr; itr2 != args.end(); itr2++)
+      rpc::parse_command_object(rpc::make_target(*itr), *itr2);
   }
 
   return torrent::Object();
diff --git a/src/main.cc b/src/main.cc
index 18de0f24..d785c1c9 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -214,6 +214,13 @@ main(int argc, char** argv) {
        "view_sort_new = seeding,state_changed\n"
        "view_sort_current = seeding,state_changed_reverse\n"
 
+       // Changing these will bork the (non-existant) scheduler.
+       "view_add = scheduler\n"
+       "view_sort_new = scheduler,state_changed\n" // add started?
+       "view_sort_current = scheduler,state_changed\n"
+
+       //    "schedule = scheduler,10,10,download_scheduler=\n"
+
        "schedule = view_main,10,10,\"view_sort=main,20\"\n"
        "schedule = view_name,10,10,\"view_sort=name,20\"\n"
        //     "schedule = view_started,10,10,view_sort=started,5\n"
@@ -221,16 +228,10 @@ main(int argc, char** argv) {
        //     "schedule = view_complete,10,10,view_sort=complete,5\n"
        //     "schedule = view_incomplete,10,10,view_sort=incomplete,5\n"
 
-       //"schedule = scheduler,10,10,download_scheduler=\n"
        "schedule = session_save,1800,1800,session_save=\n"
        "schedule = low_diskspace,5,60,close_low_diskspace=500M\n"
 
-       // Changing these will bork the (non-existant) scheduler.
-       "view_add = scheduler\n"
-       "view_sort_new = scheduler,state_changed\n" // add started?
-       "view_sort_current = scheduler,state_changed\n"
-
-       //    "schedule = scheduler,10,10,download_scheduler=\n"
+       "encryption=allow_incoming,prefer_plaintext,enable_retry\n"
     );
 
     if (OptionParser::has_flag('n', argc, argv))