diff --git a/store/event.go b/store/event.go
index 34bdf7d9b..53d4568bd 100644
--- a/store/event.go
+++ b/store/event.go
@@ -111,7 +111,7 @@ func (eh *EventHistory) addEvent(e *Event) *Event {
 	eh.rwl.Lock()
 	defer eh.rwl.Unlock()
 
-	duped := uint64(0)
+	var duped uint64
 
 	if e.Index == UndefIndex {
 		e.Index = eh.LastIndex
diff --git a/store/node.go b/store/node.go
index cad85c75f..f5545fa60 100644
--- a/store/node.go
+++ b/store/node.go
@@ -277,7 +277,8 @@ func (n *Node) Expire(s *Store) {
 		// if timeout, delete the node
 		case <-time.After(duration):
 
-			// Lock to avoid race
+			// Lock the worldLock to avoid race on s.WatchHub,
+			// and the race with other slibling nodes on their common parent.
 			s.worldLock.Lock()
 
 			e := newEvent(Expire, n.Path, UndefIndex, UndefTerm)