diff --git a/src/client/panes/plugin_pane.rs b/src/client/panes/plugin_pane.rs
index cd22e934..dde3cd9b 100644
--- a/src/client/panes/plugin_pane.rs
+++ b/src/client/panes/plugin_pane.rs
@@ -1,11 +1,12 @@
-use crate::{
-    common::thread_bus::SenderWithContext, pty::VteBytes, tab::Pane, wasm_vm::PluginInstruction,
-};
-
-use crate::panes::{PaneId, PositionAndSize};
-
+use std::sync::mpsc::channel;
 use std::time::Instant;
-use std::{sync::mpsc::channel, unimplemented};
+use std::unimplemented;
+
+use crate::common::thread_bus::SenderWithContext;
+use crate::panes::{PaneId, PositionAndSize};
+use crate::pty::VteBytes;
+use crate::tab::Pane;
+use crate::wasm_vm::PluginInstruction;
 
 pub struct PluginPane {
     pub pid: u32,
diff --git a/src/client/panes/terminal_pane.rs b/src/client/panes/terminal_pane.rs
index e0ce8ffe..5792bba9 100644
--- a/src/client/panes/terminal_pane.rs
+++ b/src/client/panes/terminal_pane.rs
@@ -1,15 +1,16 @@
-use crate::tab::Pane;
-use ::nix::pty::Winsize;
-use ::std::os::unix::io::RawFd;
-use serde::{Deserialize, Serialize};
 use std::fmt::Debug;
+use std::os::unix::io::RawFd;
 use std::time::Instant;
 
+use nix::pty::Winsize;
+use serde::{Deserialize, Serialize};
+
 use crate::panes::grid::Grid;
 use crate::panes::terminal_character::{
     CharacterStyles, TerminalCharacter, EMPTY_TERMINAL_CHARACTER,
 };
 use crate::pty::VteBytes;
+use crate::tab::Pane;
 
 #[derive(PartialEq, Eq, Ord, PartialOrd, Hash, Clone, Copy, Debug, Serialize, Deserialize)]
 pub enum PaneId {
diff --git a/src/common/errors.rs b/src/common/errors.rs
index 2a3c665b..311e8d8e 100644
--- a/src/common/errors.rs
+++ b/src/common/errors.rs
@@ -1,14 +1,16 @@
 //! Error context system based on a thread-local representation of the call stack, itself based on
 //! the instructions that are sent between threads.
 
-use super::{thread_bus::ASYNCOPENCALLS, thread_bus::OPENCALLS, ServerInstruction};
-use crate::client::ClientInstruction;
-use crate::pty::PtyInstruction;
-use crate::screen::ScreenInstruction;
 use serde::{Deserialize, Serialize};
 
 use std::fmt::{Display, Error, Formatter};
 
+use crate::server::ServerInstruction;
+use crate::common::thread_bus::{ASYNCOPENCALLS, OPENCALLS};
+use crate::client::ClientInstruction;
+use crate::pty::PtyInstruction;
+use crate::screen::ScreenInstruction;
+
 /// The maximum amount of calls an [`ErrorContext`] will keep track
 /// of in its stack representation. This is a per-thread maximum.
 const MAX_THREAD_CALL_STACK: usize = 6;