diff --git a/config/config.go b/config/config.go
index 73ffe49c83..078cd323f5 100644
--- a/config/config.go
+++ b/config/config.go
@@ -572,7 +572,7 @@ func DefaultRPCConfig() *RPCConfig {
 		MaxSubscriptionClients:    100,
 		MaxSubscriptionsPerClient: 5,
 		SubscriptionBufferSize:    defaultSubscriptionBufferSize,
-		TimeoutBroadcastTxCommit:  10 * time.Second,
+		TimeoutBroadcastTxCommit:  35 * time.Second,
 		WebSocketWriteBufferSize:  defaultSubscriptionBufferSize,
 
 		MaxBodyBytes:   int64(1000000), // 1MB
@@ -791,7 +791,7 @@ func DefaultP2PConfig() *P2PConfig {
 		DialTimeout:             3 * time.Second,
 		TestDialFail:            false,
 		QueueType:               "priority",
-		UseLegacy:               false,
+		UseLegacy:               true,
 	}
 }
 
@@ -899,9 +899,9 @@ func DefaultMempoolConfig() *MempoolConfig {
 		Size:         5000,
 		MaxTxsBytes:  1024 * 1024 * 1024, // 1GB
 		CacheSize:    10000,
-		MaxTxBytes:   1024 * 1024, // 1MB
+		MaxTxBytes:   1024 * 1024 * 3, // 3MB
 		TTLDuration:  0 * time.Second,
-		TTLNumBlocks: 0,
+		TTLNumBlocks: 15,
 	}
 }
 
@@ -1148,7 +1148,7 @@ func DefaultConsensusConfig() *ConsensusConfig {
 		TimeoutPrevoteDelta:         500 * time.Millisecond,
 		TimeoutPrecommit:            1000 * time.Millisecond,
 		TimeoutPrecommitDelta:       500 * time.Millisecond,
-		TimeoutCommit:               1000 * time.Millisecond,
+		TimeoutCommit:               25000 * time.Millisecond,
 		SkipTimeoutCommit:           false,
 		CreateEmptyBlocks:           true,
 		CreateEmptyBlocksInterval:   0 * time.Second,
diff --git a/version/version.go b/version/version.go
index 348c814ebb..1c9595ec90 100644
--- a/version/version.go
+++ b/version/version.go
@@ -21,7 +21,7 @@ const (
 var (
 	// P2PProtocol versions all p2p behavior and msgs.
 	// This includes proposer selection.
-	P2PProtocol uint64 = 8
+	P2PProtocol uint64 = 9
 
 	// BlockProtocol versions all block data structures and processing.
 	// This includes validity of blocks and state updates.