diff --git a/bin/reth/src/node/mod.rs b/bin/reth/src/node/mod.rs
index 992750c8d4a1..f99a029e8598 100644
--- a/bin/reth/src/node/mod.rs
+++ b/bin/reth/src/node/mod.rs
@@ -157,6 +157,7 @@ pub struct NodeCommand<Ext: RethCliExt = ()> {
     #[clap(flatten)]
     pub ext: Ext::Node,
 
+    /// Rollup related arguments
     #[cfg(feature = "optimism")]
     #[clap(flatten)]
     rollup: crate::args::RollupArgs,
@@ -210,13 +211,6 @@ impl<Ext: RethCliExt> NodeCommand<Ext> {
             "Either feature \"optimism\" or \"ethereum\" must be enabled for this crate."
         );
 
-        // We cannot do this since runs with `--all-features` will error.
-        // See mutually exclusive features discussion here:
-        // https://github.com/rust-lang/cargo/issues/2980
-        //
-        // #[cfg(all(feature = "ethereum", feature = "optimism"))]
-        // compile_error!("Cannot use both \"optimism\" and \"ethereum\" feature flags.");
-
         // Raise the fd limit of the process.
         // Does not do anything on windows.
         raise_fd_limit();
diff --git a/crates/interfaces/src/executor.rs b/crates/interfaces/src/executor.rs
index 4fce270a6edb..593aa3d4a894 100644
--- a/crates/interfaces/src/executor.rs
+++ b/crates/interfaces/src/executor.rs
@@ -42,6 +42,7 @@ pub enum BlockExecutionError {
     CanonicalRevert { inner: String },
     #[error("Transaction error on commit: {inner:?}")]
     CanonicalCommit { inner: String },
+
     // === tree errors ===
     // TODO(mattsse): move this to tree error
     #[error("Block hash {block_hash} not found in blockchain tree chain")]
diff --git a/crates/primitives/src/receipt.rs b/crates/primitives/src/receipt.rs
index c62b0f4eb7d6..b62e835cf7a6 100644
--- a/crates/primitives/src/receipt.rs
+++ b/crates/primitives/src/receipt.rs
@@ -205,21 +205,13 @@ impl proptest::arbitrary::Arbitrary for Receipt {
                         logs in proptest::collection::vec(proptest::arbitrary::any::<Log>(), 0..=20),
                         _deposit_nonce in any::<Option<u64>>()) -> Receipt
             {
-
-                // Only reecipts for deposit transactions may contain a deposit nonce
-                #[cfg(feature = "optimism")]
-                let deposit_nonce = if tx_type == TxType::DEPOSIT {
-                    _deposit_nonce
-                } else {
-                    None
-                };
-
                 Receipt { tx_type,
                     success,
                     cumulative_gas_used,
                     logs,
+                    // Only reecipts for deposit transactions may contain a deposit nonce
                     #[cfg(feature = "optimism")]
-                    deposit_nonce
+                    deposit_nonce: (tx_type == TxType::DEPOSIT).then_some(_deposit_nonce).flatten()
                 }
             }
         };