diff --git a/packages/contracts-communication/contracts/libs/InterchainEntry.sol b/packages/contracts-communication/contracts/libs/InterchainEntry.sol
index 268db1b55f..57944a94ee 100644
--- a/packages/contracts-communication/contracts/libs/InterchainEntry.sol
+++ b/packages/contracts-communication/contracts/libs/InterchainEntry.sol
@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import {TypeCasts} from "./TypeCasts.sol";
-
 import {SafeCast} from "@openzeppelin/contracts/utils/math/SafeCast.sol";
 
 /// @notice Struct representing an entry in the Interchain DataBase.
@@ -39,7 +37,8 @@ library InterchainEntryLib {
         view
         returns (InterchainEntry memory entry)
     {
-        return InterchainEntry({srcChainId: SafeCast.toUint64(block.chainid), dbNonce: dbNonce, entryValue: entryValue});
+        uint64 srcChainId = SafeCast.toUint64(block.chainid);
+        return InterchainEntry({srcChainId: srcChainId, dbNonce: dbNonce, entryValue: entryValue});
     }
 
     /// @notice Returns the value of the entry: writer + digest hashed together
diff --git a/packages/contracts-communication/test/InterchainDB.Src.t.sol b/packages/contracts-communication/test/InterchainDB.Src.t.sol
index e993ad559a..6dd694b510 100644
--- a/packages/contracts-communication/test/InterchainDB.Src.t.sol
+++ b/packages/contracts-communication/test/InterchainDB.Src.t.sol
@@ -1,13 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.20;
 
-import {
-    InterchainDB,
-    InterchainEntry,
-    InterchainEntryLib,
-    IInterchainDB,
-    InterchainDBEvents
-} from "../contracts/InterchainDB.sol";
+import {InterchainDB, InterchainEntry, IInterchainDB, InterchainDBEvents} from "../contracts/InterchainDB.sol";
 
 import {InterchainEntryLibHarness} from "./harnesses/InterchainEntryLibHarness.sol";
 import {VersionedPayloadLibHarness} from "./harnesses/VersionedPayloadLibHarness.sol";
diff --git a/packages/contracts-communication/test/apps/ICAppV1.Messaging.t.sol b/packages/contracts-communication/test/apps/ICAppV1.Messaging.t.sol
index beae9ef2d3..86057f704b 100644
--- a/packages/contracts-communication/test/apps/ICAppV1.Messaging.t.sol
+++ b/packages/contracts-communication/test/apps/ICAppV1.Messaging.t.sol
@@ -9,6 +9,8 @@ import {ICAppV1Harness} from "../harnesses/ICAppV1Harness.sol";
 
 import {IAccessControl} from "@openzeppelin/contracts/access/IAccessControl.sol";
 
+// solhint-disable func-name-mixedcase
+// solhint-disable ordering
 contract ICAppV1MessagingTest is InterchainAppV1MessagingTest {
     /// @dev This should deploy the Interchain App V1 contract and give `governor`
     /// privileges to setup its interchain configuration.
diff --git a/packages/contracts-communication/test/integration/PingPong.t.sol b/packages/contracts-communication/test/integration/PingPong.t.sol
index 01ca94dcda..210d771ea5 100644
--- a/packages/contracts-communication/test/integration/PingPong.t.sol
+++ b/packages/contracts-communication/test/integration/PingPong.t.sol
@@ -3,7 +3,7 @@ pragma solidity 0.8.20;
 
 import {PingPongApp} from "../../contracts/apps/examples/PingPongApp.sol";
 
-import {ICIntegrationTest, InterchainEntry, InterchainTransaction} from "./ICIntegration.t.sol";
+import {ICIntegrationTest, InterchainTransaction} from "./ICIntegration.t.sol";
 
 import {OptionsV1} from "../../contracts/libs/Options.sol";
 
diff --git a/packages/contracts-communication/test/integration/legacy/LegacyPingPong.t.sol b/packages/contracts-communication/test/integration/legacy/LegacyPingPong.t.sol
index 0a73c50291..52677de4ec 100644
--- a/packages/contracts-communication/test/integration/legacy/LegacyPingPong.t.sol
+++ b/packages/contracts-communication/test/integration/legacy/LegacyPingPong.t.sol
@@ -8,7 +8,7 @@ import {LegacyMessageLib} from "../../../contracts/legacy/libs/LegacyMessage.sol
 import {LegacyOptionsLib} from "../../../contracts/legacy/libs/LegacyOptions.sol";
 import {TypeCasts} from "../../../contracts/libs/TypeCasts.sol";
 
-import {ICIntegrationTest, InterchainEntry, InterchainTransaction, OptionsV1} from "../ICIntegration.t.sol";
+import {ICIntegrationTest, InterchainTransaction, OptionsV1} from "../ICIntegration.t.sol";
 import {MessageBusHarness} from "../../harnesses/MessageBusHarness.sol";
 
 // solhint-disable custom-errors