diff --git a/packages/celotool/src/lib/port_forward.ts b/packages/celotool/src/lib/port_forward.ts
index 850cb77dd16..271ccd0d62f 100644
--- a/packages/celotool/src/lib/port_forward.ts
+++ b/packages/celotool/src/lib/port_forward.ts
@@ -14,18 +14,18 @@ const DEFAULT_COMPONENT = 'validators'
 
 async function getPortForwardCmd(celoEnv: string, component?: string, ports = defaultPortsString) {
   if (isVmBased()) {
-    return Promise.resolve(getVmPortForwardCmd(celoEnv, ports))
+    return Promise.resolve(getVmPortForwardCmd(celoEnv, component, ports))
   } else {
     return getKubernetesPortForwardCmd(celoEnv, component, ports)
   }
 }
 
-function getVmPortForwardCmd(celoEnv: string, ports = defaultPortsString) {
+function getVmPortForwardCmd(celoEnv: string, machine = 'validator-0', ports = defaultPortsString) {
   const zone = fetchEnv(envVar.KUBERNETES_CLUSTER_ZONE)
   // this command expects port mappings to be of the form `[localPort]:localhost:[remotePort]`
   const portMappings = ports.replace(/:/g, ':localhost:').split(' ')
   const portsWithFlags = portMappings.map((mapping) => `-L ${mapping}`).join(' ')
-  return `gcloud compute ssh --zone ${zone} ${celoEnv}-validator-0 -- -N ${portsWithFlags}`
+  return `gcloud compute ssh --zone ${zone} ${celoEnv}-${machine} -- -N ${portsWithFlags}`
 }
 
 async function getKubernetesPortForwardCmd(
diff --git a/packages/cli/src/commands/validator/signed-blocks.ts b/packages/cli/src/commands/validator/signed-blocks.ts
index 0f9f028547c..1526e8f1ec8 100644
--- a/packages/cli/src/commands/validator/signed-blocks.ts
+++ b/packages/cli/src/commands/validator/signed-blocks.ts
@@ -59,9 +59,9 @@ export default class ValidatorSignedBlocks extends BaseCommand {
     const printer = new MarkPrinter(res.flags.width!)
     try {
       for (const block of blocks) {
-        const elected = await electionCache.elected(res.flags.signer, block.number)
-        const signed = elected && (await electionCache.signed(res.flags.signer, block))
-        printer.addMark(block.number, elected, signed)
+        const elected = await electionCache.elected(res.flags.signer, block.number - 1)
+        const signed = elected && (await electionCache.signedParent(res.flags.signer, block))
+        printer.addMark(block.number - 1, elected, signed)
       }
 
       // TODO(victor) Fix the follow flag functionality.
diff --git a/packages/cli/src/commands/validator/status.ts b/packages/cli/src/commands/validator/status.ts
index 1f421212157..022915890e3 100644
--- a/packages/cli/src/commands/validator/status.ts
+++ b/packages/cli/src/commands/validator/status.ts
@@ -133,9 +133,9 @@ export default class ValidatorStatus extends BaseCommand {
     let signatures = 0
     let eligible = 0
     for (const block of blocks) {
-      if (await electionCache.elected(signer, block.number)) {
+      if (await electionCache.elected(signer, block.number - 1)) {
         eligible++
-        if (await electionCache.signed(signer, block)) {
+        if (await electionCache.signedParent(signer, block)) {
           signatures++
         }
       }
diff --git a/packages/cli/src/utils/election.ts b/packages/cli/src/utils/election.ts
index 08735648945..7f9c47fba8b 100644
--- a/packages/cli/src/utils/election.ts
+++ b/packages/cli/src/utils/election.ts
@@ -40,10 +40,10 @@ export class ElectionResultsCache {
 
   /**
    * Returns true if the given signer is present in the parent aggregated seal of the given block.
-   * @param signer Validator signer address to check if presnt in the block.
+   * @param signer Validator signer address to check if present in the block.
    * @param block The block to check for a signature on.
    */
-  async signed(signer: Address, block: Block): Promise<boolean> {
+  async signedParent(signer: Address, block: Block): Promise<boolean> {
     const electedSigners = await this.electedSigners(block.number)
     const signerIndex = electedSigners.map(eqAddress.bind(null, signer)).indexOf(true)
     if (signerIndex < 0) {