diff --git a/rpcserver.go b/rpcserver.go
index dc76be02..5c299c4f 100644
--- a/rpcserver.go
+++ b/rpcserver.go
@@ -3096,7 +3096,7 @@ func (r *rpcServer) PendingChannels(ctx context.Context,
 				return nil, err
 			}
 
-			resp.TotalLimboBalance += int64(forceClose.LimboBalance)
+			resp.TotalLimboBalance += forceClose.LimboBalance
 
 			resp.PendingForceClosingChannels = append(
 				resp.PendingForceClosingChannels,
@@ -4311,6 +4311,10 @@ func (r *rpcServer) extractPaymentIntent(rpcPayReq *rpcPaymentRequest) (rpcPayme
 	if len(rpcPayReq.PaymentAddr) != 0 && len(rpcPayReq.PaymentAddr) != 32 {
 		return payIntent, errors.New("invalid payment address length")
 	}
+
+	if payIntent.paymentAddr == nil {
+		payIntent.paymentAddr = &[32]byte{}
+	}
 	copy(payIntent.paymentAddr[:], rpcPayReq.PaymentAddr)
 
 	// Otherwise, If the payment request field was not specified