diff --git a/src/ffi/java/cursor.rs b/src/ffi/java/cursor.rs
index 60f2810..57fa1d5 100644
--- a/src/ffi/java/cursor.rs
+++ b/src/ffi/java/cursor.rs
@@ -5,10 +5,6 @@ use crate::{
 	},
 	errors::ControllerError,
 };
-use crate::{
-	api::{Controller, Cursor},
-	errors::ControllerError,
-};
 use jni::{objects::JObject, JNIEnv};
 use jni_toolbox::jni;
 
diff --git a/src/ffi/js/buffer.rs b/src/ffi/js/buffer.rs
index 945b25c..e3a9f48 100644
--- a/src/ffi/js/buffer.rs
+++ b/src/ffi/js/buffer.rs
@@ -5,10 +5,6 @@ use crate::buffer::controller::BufferController;
 use napi::threadsafe_function::{
 	ErrorStrategy::Fatal, ThreadSafeCallContext, ThreadsafeFunction, ThreadsafeFunctionCallMode,
 };
-use napi::threadsafe_function::{
-	ErrorStrategy::Fatal, ThreadSafeCallContext, ThreadsafeFunction, ThreadsafeFunctionCallMode,
-};
-use napi_derive::napi;
 use napi_derive::napi;
 
 #[napi]
@@ -56,13 +52,15 @@ impl BufferController {
 
 	/// Return next buffer event if present
 	#[napi(js_name = "try_recv")]
-	pub async fn js_try_recv(&self) -> napi::Result<Option<Delta<BufferAck>>> {
+	pub async fn js_try_recv(
+		&self,
+	) -> napi::Result<Option<Delta<crate::buffer::controller::BufferAck>>> {
 		Ok(self.try_recv().await?)
 	}
 
 	/// Wait for next buffer event and return it
 	#[napi(js_name = "recv")]
-	pub async fn js_recv(&self) -> napi::Result<Delta<BufferAck>> {
+	pub async fn js_recv(&self) -> napi::Result<Delta<crate::buffer::controller::BufferAck>> {
 		Ok(self.recv().await?)
 	}
 
diff --git a/src/ffi/js/cursor.rs b/src/ffi/js/cursor.rs
index f7fbf4f..79af392 100644
--- a/src/ffi/js/cursor.rs
+++ b/src/ffi/js/cursor.rs
@@ -1,14 +1,9 @@
 use crate::api::controller::{AsyncReceiver, AsyncSender};
 use crate::cursor::controller::CursorController;
 use napi::threadsafe_function::ErrorStrategy::Fatal;
-use napi::threadsafe_function::ErrorStrategy::Fatal;
 use napi::threadsafe_function::{
 	ThreadSafeCallContext, ThreadsafeFunction, ThreadsafeFunctionCallMode,
 };
-use napi::threadsafe_function::{
-	ThreadSafeCallContext, ThreadsafeFunction, ThreadsafeFunctionCallMode,
-};
-use napi_derive::napi;
 use napi_derive::napi;
 
 #[napi(object, js_name = "Cursor")]
diff --git a/src/ffi/js/workspace.rs b/src/ffi/js/workspace.rs
index 294dd98..bacde0e 100644
--- a/src/ffi/js/workspace.rs
+++ b/src/ffi/js/workspace.rs
@@ -146,12 +146,15 @@ impl Workspace {
 
 	/// List users attached to a specific buffer
 	#[napi(js_name = "list_buffer_users")]
-	pub async fn js_list_buffer_users(&self, path: String) -> napi::Result<Vec<JsUser>> {
+	pub async fn js_list_buffer_users(
+		&self,
+		path: String,
+	) -> napi::Result<Vec<crate::ffi::js::client::JsUser>> {
 		Ok(self
 			.list_buffer_users(&path)
 			.await?
 			.into_iter()
-			.map(JsUser::from)
+			.map(super::client::JsUser::from)
 			.collect())
 	}
 }