diff --git a/substrate/tendermint/client/src/import_queue.rs b/substrate/tendermint/client/src/import_queue.rs
index cf641d6a..14256978 100644
--- a/substrate/tendermint/client/src/import_queue.rs
+++ b/substrate/tendermint/client/src/import_queue.rs
@@ -1,4 +1,5 @@
 use std::{
+  convert::TryInto,
   pin::Pin,
   sync::{Arc, RwLock},
   task::{Poll, Context},
@@ -115,8 +116,8 @@ where
         0,
         (
           // Header::Number: TryInto<u64> doesn't implement Debug and can't be unwrapped
-          match best.try_into() {
-            Ok(best) => BlockNumber(best),
+          match TryInto::<u64>::try_into(best) {
+            Ok(best) => BlockNumber(best + 1),
             Err(_) => panic!("BlockNumber exceeded u64"),
           },
           Commit::<TendermintValidators<B, Be, C>>::decode(
diff --git a/substrate/tendermint/client/src/validators.rs b/substrate/tendermint/client/src/validators.rs
index 189805b7..45511aac 100644
--- a/substrate/tendermint/client/src/validators.rs
+++ b/substrate/tendermint/client/src/validators.rs
@@ -24,8 +24,8 @@ struct TendermintValidatorsStruct {
   total_weight: u64,
   weights: Vec<u64>,
 
-  keys: Pair,          // TODO: sp_keystore
-  lookup: Vec<Public>, // TODO: sessions
+  keys: Pair, // TODO: sp_keystore
+  lookup: Vec<Public>,
 }
 
 impl TendermintValidatorsStruct {
diff --git a/substrate/tendermint/machine/src/lib.rs b/substrate/tendermint/machine/src/lib.rs
index a2134cd9..7fb02bf6 100644
--- a/substrate/tendermint/machine/src/lib.rs
+++ b/substrate/tendermint/machine/src/lib.rs
@@ -157,7 +157,7 @@ impl<N: Network + 'static> TendermintMachine<N> {
   fn timeout(&self, step: Step) -> Instant {
     let mut round_time = Duration::from_secs(N::BLOCK_TIME.into());
     round_time *= self.round.0 + 1;
-    let step_time = round_time / 3;
+    let step_time = round_time / 3; // TODO: Non-uniform timeouts
 
     let offset = match step {
       Step::Propose => step_time,