diff --git a/crates/orchestrator/src/lib.rs b/crates/orchestrator/src/lib.rs
index 397f797734..7a3dc5c218 100644
--- a/crates/orchestrator/src/lib.rs
+++ b/crates/orchestrator/src/lib.rs
@@ -504,7 +504,6 @@ where
             });
         }
 
-        self.manual_start_allowed = false;
         Ok(self.config.clone())
     }
 
@@ -595,6 +594,7 @@ where
         self.accepting_new_keys = false;
         self.manual_start_allowed = false;
         self.peer_pub_ready = true;
+        self.start = true;
 
         Ok(())
     }
diff --git a/crates/task-impls/src/consensus2/mod.rs b/crates/task-impls/src/consensus2/mod.rs
index 3e7511fe8f..dca4019d26 100644
--- a/crates/task-impls/src/consensus2/mod.rs
+++ b/crates/task-impls/src/consensus2/mod.rs
@@ -6,11 +6,6 @@
 
 use std::sync::Arc;
 
-use self::handlers::{
-    handle_quorum_vote_recv, handle_timeout, handle_timeout_vote_recv, handle_view_change,
-};
-use crate::helpers::broadcast_event;
-use crate::{events::HotShotEvent, vote_collection::VoteCollectorsMap};
 use anyhow::Result;
 use async_broadcast::{Receiver, Sender};
 use async_lock::RwLock;
@@ -34,6 +29,11 @@ use hotshot_types::{
 use tokio::task::JoinHandle;
 use tracing::instrument;
 
+use self::handlers::{
+    handle_quorum_vote_recv, handle_timeout, handle_timeout_vote_recv, handle_view_change,
+};
+use crate::{events::HotShotEvent, helpers::broadcast_event, vote_collection::VoteCollectorsMap};
+
 /// Event handlers for use in the `handle` method.
 mod handlers;
 
diff --git a/crates/types/src/vid.rs b/crates/types/src/vid.rs
index 07f5b2cb1d..5c2fd2cead 100644
--- a/crates/types/src/vid.rs
+++ b/crates/types/src/vid.rs
@@ -35,7 +35,8 @@ use serde::{Deserialize, Serialize};
 use sha2::Sha256;
 
 use crate::{
-    constants::SRS_DEGREE, data::VidDisperse as HotShotVidDisperse, data::VidDisperseShare,
+    constants::SRS_DEGREE,
+    data::{VidDisperse as HotShotVidDisperse, VidDisperseShare},
     message::Proposal,
 };