diff --git a/src/interpreter.rs b/src/interpreter.rs
index 3ca7bf7b6..8134bf905 100644
--- a/src/interpreter.rs
+++ b/src/interpreter.rs
@@ -12,11 +12,11 @@
 
 //! Interpreter for eBPF programs.
 
-use crate::program::BuiltinFunction;
 use crate::{
     ebpf::{self, STACK_PTR_REG},
     elf::Executable,
     error::{EbpfError, ProgramResult},
+    program::BuiltinFunction,
     vm::{Config, ContextObject, EbpfVm},
 };
 
diff --git a/src/jit.rs b/src/jit.rs
index 65d7d714b..1971d61c8 100644
--- a/src/jit.rs
+++ b/src/jit.rs
@@ -23,7 +23,6 @@ use rand::{
 };
 use std::{fmt::Debug, mem, ptr};
 
-use crate::program::BuiltinFunction;
 use crate::{
     ebpf::{self, FIRST_SCRATCH_REG, FRAME_PTR_REG, INSN_SIZE, SCRATCH_REGS, STACK_PTR_REG},
     elf::Executable,
@@ -32,6 +31,7 @@ use crate::{
         allocate_pages, free_pages, get_system_page_size, protect_pages, round_to_page_size,
     },
     memory_region::{AccessType, MemoryMapping},
+    program::BuiltinFunction,
     vm::{get_runtime_environment_key, Config, ContextObject, EbpfVm},
     x86::*,
 };
diff --git a/tests/execution.rs b/tests/execution.rs
index dae3255c8..acd348357 100644
--- a/tests/execution.rs
+++ b/tests/execution.rs
@@ -2989,7 +2989,7 @@ fn test_far_jumps() {
 #[test]
 fn test_symbol_relocation() {
     let config = Config {
-        // No relocations are necessary in SBFPv2
+        // No relocation is necessary in SBFPv2
         enabled_sbpf_versions: SBPFVersion::V1..=SBPFVersion::V1,
         ..Config::default()
     };