diff --git a/blockchain/reactor.go b/blockchain/reactor.go
index b66a17a4..fd0d4432 100644
--- a/blockchain/reactor.go
+++ b/blockchain/reactor.go
@@ -253,12 +253,12 @@ FOR_LOOP:
 }
 
 func (bcR *BlockchainReactor) BroadcastStatusResponse() error {
-	bcR.Switch.Broadcast(BlockchainChannel, &bcStatusResponseMessage{bcR.store.Height()})
+	bcR.Switch.Broadcast(BlockchainChannel, struct{ BlockchainMessage }{&bcStatusResponseMessage{bcR.store.Height()}})
 	return nil
 }
 
 func (bcR *BlockchainReactor) BroadcastStatusRequest() error {
-	bcR.Switch.Broadcast(BlockchainChannel, &bcStatusRequestMessage{bcR.store.Height()})
+	bcR.Switch.Broadcast(BlockchainChannel, struct{ BlockchainMessage }{&bcStatusRequestMessage{bcR.store.Height()}})
 	return nil
 }
 
diff --git a/consensus/reactor.go b/consensus/reactor.go
index 57e6af4e..72139d9e 100644
--- a/consensus/reactor.go
+++ b/consensus/reactor.go
@@ -249,10 +249,10 @@ func (conR *ConsensusReactor) broadcastNewRoundStep(rs *RoundState) {
 
 	nrsMsg, csMsg := makeRoundStepMessages(rs)
 	if nrsMsg != nil {
-		conR.Switch.Broadcast(StateChannel, nrsMsg)
+		conR.Switch.Broadcast(StateChannel, struct{ ConsensusMessage }{nrsMsg})
 	}
 	if csMsg != nil {
-		conR.Switch.Broadcast(StateChannel, csMsg)
+		conR.Switch.Broadcast(StateChannel, struct{ ConsensusMessage }{csMsg})
 	}
 }
 
@@ -264,7 +264,7 @@ func (conR *ConsensusReactor) broadcastHasVoteMessage(vote *types.Vote, index in
 		Type:   vote.Type,
 		Index:  index,
 	}
-	conR.Switch.Broadcast(StateChannel, msg)
+	conR.Switch.Broadcast(StateChannel, struct{ ConsensusMessage }{msg})
 	/*
 		// TODO: Make this broadcast more selective.
 		for _, peer := range conR.Switch.Peers().List() {
diff --git a/consensus/state.go b/consensus/state.go
index 8dc67182..76421325 100644
--- a/consensus/state.go
+++ b/consensus/state.go
@@ -1245,7 +1245,7 @@ func (cs *ConsensusState) tryAddVote(valIndex int, vote *types.Vote, peerKey str
 				VoteA:   *errDupe.VoteA,
 				VoteB:   *errDupe.VoteB,
 			}
-			cs.mempool.BroadcastTx(evidenceTx) // shouldn't need to check returned err
+			cs.mempool.BroadcastTx(struct{???}{evidenceTx}) // shouldn't need to check returned err
 			*/
 			return err
 		} else {