diff --git a/gotest.sh b/gotest.sh
index bbb16695..8a88e217 100755
--- a/gotest.sh
+++ b/gotest.sh
@@ -77,7 +77,7 @@ test_race_conditions() {
     check_test_ports
     
     test_targets=$(go list ./... | grep -v '/vendor/')
-    env GORACE="halt_on_error=1" go test -p 1 -v -race $test_targets
+    env GORACE="halt_on_error=1" go test -v -race $test_targets
 }
 
 # lint_check runs static checks.
@@ -166,4 +166,4 @@ if [ "$NEED_COVERAGE" == "true" ]; then
     test_with_coverage_profile
 fi
 
-print "=====+ End +====="
\ No newline at end of file
+print "=====+ End +====="
diff --git a/htlcswitch/link.go b/htlcswitch/link.go
index 5b1c594f..eb94cffc 100644
--- a/htlcswitch/link.go
+++ b/htlcswitch/link.go
@@ -944,7 +944,7 @@ func (l *channelLink) processLockedInHtlcs(
 					log.Errorf("Onion payload of incoming "+
 						"htlc(%x) has incorrect time-lock: "+
 						"expected %v, got %v",
-						l.cfg.FwrdingPolicy.TimeLockDelta,
+						pd.RHash[:], l.cfg.FwrdingPolicy.TimeLockDelta,
 						fwdInfo.OutgoingCTLV)
 
 					reason := []byte{byte(lnwire.UpstreamTimeout)}
@@ -1061,7 +1061,8 @@ func (l *channelLink) processLockedInHtlcs(
 					log.Errorf("Incoming htlc(%x) has "+
 						"incorrect time-lock value: expected "+
 						"%v blocks, got %v blocks",
-						pd.Timeout-timeDelta, fwdInfo.OutgoingCTLV)
+						pd.RHash[:], pd.Timeout-timeDelta,
+						fwdInfo.OutgoingCTLV)
 
 					// TODO(andrew.shvv): send proper back error
 					reason := []byte{byte(lnwire.UpstreamTimeout)}
diff --git a/htlcswitch/switch.go b/htlcswitch/switch.go
index 24b9bf38..8e4b0e77 100644
--- a/htlcswitch/switch.go
+++ b/htlcswitch/switch.go
@@ -837,8 +837,8 @@ type getLinksCmd struct {
 	done chan []ChannelLink
 }
 
-// GetLinks fetches all the links connected to a particular node identified by
-// the serialized compressed form of its public key.
+// GetLinksByInterface fetches all the links connected to a particular node
+// identified by the serialized compressed form of its public key.
 func (s *Switch) GetLinksByInterface(hop [33]byte) ([]ChannelLink, error) {
 	command := &getLinksCmd{
 		peer: hop,