diff --git a/zebra-chain/src/block/light_client.rs b/zebra-chain/src/block/light_client.rs
index f526917f..9b423abf 100644
--- a/zebra-chain/src/block/light_client.rs
+++ b/zebra-chain/src/block/light_client.rs
@@ -1,6 +1,6 @@
 //! The LightClientRootHash enum, used for the corresponding block header field.
 
-use crate::note_commitment_tree::SaplingNoteTreeRootHash;
+use crate::treestate::note_commitment_tree::SaplingNoteTreeRootHash;
 use crate::types::BlockHeight;
 use crate::{Network, NetworkUpgrade, NetworkUpgrade::*};
 
diff --git a/zebra-chain/src/types/amount.rs b/zebra-chain/src/types/amount.rs
index b6c0ed85..ff7ffcc0 100644
--- a/zebra-chain/src/types/amount.rs
+++ b/zebra-chain/src/types/amount.rs
@@ -5,6 +5,8 @@ use std::{
     ops::RangeInclusive,
 };
 
+use byteorder::{ByteOrder, LittleEndian};
+
 type Result<T, E = Error> = std::result::Result<T, E>;
 
 /// A runtime validated type for representing amounts of zatoshis
@@ -24,7 +26,9 @@ impl<C> Amount<C> {
 
     /// To little endian byte array
     pub fn to_bytes(&self) -> [u8; 8] {
-        self.0.to_le_bytes()
+        let mut buf: [u8; 8] = [0; 8];
+        LittleEndian::write_i64(&mut buf, self.0);
+        buf
     }
 }