diff --git a/cmd/lncli/commands.go b/cmd/lncli/commands.go
index 44d87a400..712ee0e6d 100644
--- a/cmd/lncli/commands.go
+++ b/cmd/lncli/commands.go
@@ -803,7 +803,7 @@ var DescribeGraphCommand = cli.Command{
 	Usage: "describegraph",
 	Flags: []cli.Flag{
 		cli.BoolFlag{
-			Name:  "draw",
+			Name:  "render",
 			Usage: "If true, then an image of graph will be generated and displayed. The generated image is stored within the current directory with a file name of 'graph.svg'",
 		},
 	},
@@ -823,7 +823,7 @@ func describeGraph(ctx *cli.Context) error {
 
 	// If the draw flag is on, then we'll use the 'dot' command to create a
 	// visualization of the graph itself.
-	if ctx.Bool("draw") {
+	if ctx.Bool("render") {
 		return drawChannelGraph(graph)
 	}
 
diff --git a/lnd_test.go b/lnd_test.go
index ba5f38959..3d11e71b4 100644
--- a/lnd_test.go
+++ b/lnd_test.go
@@ -795,7 +795,7 @@ func testMultiHopPayments(net *networkHarness, t *harnessTest) {
 	// Carol's routing table should show a path from Carol -> Alice -> Bob,
 	// with the two channels above recognized as the only links within the
 	// network.
-	time.Sleep(time.Second)
+	time.Sleep(time.Second * 2)
 	req := &lnrpc.ChannelGraphRequest{}
 	chanGraph, err := carol.DescribeGraph(ctxb, req)
 	if err != nil {
@@ -1508,6 +1508,7 @@ func testHtlcErrorPropagation(net *networkHarness, t *harnessTest) {
 		Dest:        carol.PubKey[:],
 		Amt:         payAmt,
 	}
+	time.Sleep(time.Millisecond * 500)
 	if err := alicePayStream.Send(sendReq); err != nil {
 		t.Fatalf("unable to send payment: %v", err)
 	}