diff --git a/electrum/commands.py b/electrum/commands.py
index b29691977..e97dfb230 100644
--- a/electrum/commands.py
+++ b/electrum/commands.py
@@ -38,6 +38,7 @@ from typing import Optional, TYPE_CHECKING
 
 from .import util, ecc
 from .util import bfh, bh2u, format_satoshis, json_decode, json_encode, is_hash256_str, is_hex_str, to_bytes, timestamp_to_datetime
+from .util import standardize_path
 from . import bitcoin
 from .bitcoin import is_address,  hash_160, COIN, TYPE_ADDRESS
 from .bip32 import BIP32Node
diff --git a/electrum/lnrouter.py b/electrum/lnrouter.py
index 465d3e2d9..e5323bd45 100644
--- a/electrum/lnrouter.py
+++ b/electrum/lnrouter.py
@@ -128,7 +128,7 @@ class LNPathFinder(Logger):
         """Heuristic cost of going through a channel.
         Returns (heuristic_cost, fee_for_edge_msat).
         """
-        channel_info = self.channel_db.get_channel_info(short_channel_id)  # type: ChannelInfo
+        channel_info = self.channel_db.get_channel_info(short_channel_id)
         if channel_info is None:
             return float('inf'), 0
         channel_policy = self.channel_db.get_policy_for_node(short_channel_id, start_node)
diff --git a/electrum/tests/test_lnchannel.py b/electrum/tests/test_lnchannel.py
index e24d19a0c..10501b417 100644
--- a/electrum/tests/test_lnchannel.py
+++ b/electrum/tests/test_lnchannel.py
@@ -741,6 +741,8 @@ class TestChanReserve(unittest.TestCase):
         # Resulting balances:
         #	Alice:	3.0
         #	Bob:	7.0
+        paymentPreimage = b"\x01" * 32
+        paymentHash = bitcoin.sha256(paymentPreimage)
         htlc_dict = {
             'payment_hash' : paymentHash,
             'amount_msat' :  int(2 * one_bitcoin_in_msat),