diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst
index 3bd1122770..b44c52c241 100644
--- a/docs/source/changelog.rst
+++ b/docs/source/changelog.rst
@@ -46,14 +46,6 @@ Unreleased
 
 * Upgraded H2 to v1.4.197.
 
-* Shell (embedded available only in dev mode or via SSH) connects to the node via RPC instead of using the ``CordaRPCOps`` object directly.
-  To enable RPC connectivity ensure node’s ``rpcSettings.address`` and ``rpcSettings.adminAddress`` settings are present.
-
-.. _changelog_v3:
-
-Version 3.0
------------
-
 * Per CorDapp configuration is now exposed. ``CordappContext`` now exposes a ``CordappConfig`` object that is populated
   at CorDapp context creation time from a file source during runtime.
 
diff --git a/network-management/src/integration-test/kotlin/com/r3/corda/networkmanage/doorman/NetworkParametersUpdateTest.kt b/network-management/src/integration-test/kotlin/com/r3/corda/networkmanage/doorman/NetworkParametersUpdateTest.kt
index 4764ed3391..9479591608 100644
--- a/network-management/src/integration-test/kotlin/com/r3/corda/networkmanage/doorman/NetworkParametersUpdateTest.kt
+++ b/network-management/src/integration-test/kotlin/com/r3/corda/networkmanage/doorman/NetworkParametersUpdateTest.kt
@@ -5,7 +5,6 @@ import com.r3.corda.networkmanage.common.utils.CertPathAndKey
 import com.r3.corda.networkmanage.doorman.signer.LocalSigner
 import net.corda.core.crypto.random63BitValue
 import net.corda.core.internal.bufferUntilSubscribed
-import net.corda.core.internal.concurrent.transpose
 import net.corda.core.internal.div
 import net.corda.core.internal.readObject
 import net.corda.core.messaging.ParametersUpdateInfo
@@ -90,15 +89,19 @@ class NetworkParametersUpdateTest : IntegrationTest() {
         internalDriver(
                 portAllocation = portAllocation,
                 compatibilityZone = compatibilityZone,
+                notarySpecs = emptyList(),
                 initialiseSerialization = false,
                 extraCordappPackagesToScan = listOf("net.corda.finance")
         ) {
-            var (alice) = listOf(
+            var (alice, bob) = listOf(
                     startNode(providedName = ALICE_NAME),
-                    startNode(providedName = BOB_NAME),
-                    defaultNotaryNode
-            ).transpose().getOrThrow()
-            alice as NodeHandleInternal
+                    startNode(providedName = BOB_NAME)
+            ).map { it.getOrThrow() as NodeHandleInternal }
+
+            // Make sure that stopping Bob doesn't remove him from the network map
+            bob.stop()
+            Thread.sleep(timeoutMillis * 2)
+            assertThat(alice.rpc.networkMapSnapshot().map { it.legalIdentities[0].name }).contains(BOB_NAME)
 
             val snapshot = alice.rpc.networkParametersFeed().snapshot
             val updates = alice.rpc.networkParametersFeed().updates.bufferUntilSubscribed()
diff --git a/network-management/src/main/kotlin/com/r3/corda/networkmanage/doorman/NetworkManagementServer.kt b/network-management/src/main/kotlin/com/r3/corda/networkmanage/doorman/NetworkManagementServer.kt
index fceea62fe0..60caebc71b 100644
--- a/network-management/src/main/kotlin/com/r3/corda/networkmanage/doorman/NetworkManagementServer.kt
+++ b/network-management/src/main/kotlin/com/r3/corda/networkmanage/doorman/NetworkManagementServer.kt
@@ -258,8 +258,8 @@ class NetworkManagementServer(dataSourceProperties: Properties,
             "Parameters we are trying to switch to haven't been signed yet"
         }
         logger.info("""Flag day has occurred, however the new network parameters won't be active until the new network map is signed.
-From: $activeNetParams
-To: ${parametersUpdate.networkParameters}""")
+From: ${activeNetParams?.networkParameters}
+To: ${parametersUpdate.networkParameters.networkParameters}""")
         networkMapStorage.setParametersUpdateStatus(parametersUpdate, UpdateStatus.FLAG_DAY)
     }
 
diff --git a/perftestcordapp/src/integrationTest/kotlin/com/r3/corda/enterprise/perftestcordapp/NodePerformanceTests.kt b/perftestcordapp/src/integrationTest/kotlin/com/r3/corda/enterprise/perftestcordapp/NodePerformanceTests.kt
index a9433946d5..344b084340 100644
--- a/perftestcordapp/src/integrationTest/kotlin/com/r3/corda/enterprise/perftestcordapp/NodePerformanceTests.kt
+++ b/perftestcordapp/src/integrationTest/kotlin/com/r3/corda/enterprise/perftestcordapp/NodePerformanceTests.kt
@@ -174,7 +174,6 @@ class NodePerformanceTests : IntegrationTest() {
         )) {
             val aliceFuture = startNode(providedName = ALICE_NAME, rpcUsers = listOf(user), startInSameProcess = true)
             val alice = aliceFuture.getOrThrow() as InProcess
-            defaultNotaryNode.getOrThrow()
             val metricRegistry = startReporter((this as InternalDriverDSL).shutdownManager, alice.internalServices.monitoringService.metrics)
             CordaRPCClient(alice.rpcAddress).use("A", "A") { connection ->
                 startPublishingFixedRateInjector(
@@ -202,7 +201,6 @@ class NodePerformanceTests : IntegrationTest() {
             val bobFuture = startNode(providedName = BOB_NAME, rpcUsers = listOf(user))
             val alice = aliceFuture.getOrThrow() as InProcess
             val bob = bobFuture.getOrThrow() as InProcess
-            defaultNotaryNode.getOrThrow()
             CordaRPCClient(alice.rpcAddress).use("A", "A") { connection ->
                 connection.proxy.startFlow(::CashIssueAndPaymentNoSelection, 1.DOLLARS, OpaqueBytes.of(0), bob.nodeInfo.legalIdentities[0], false, defaultNotaryIdentity).returnValue.getOrThrow()
             }
diff --git a/perftestcordapp/src/integrationTest/kotlin/com/r3/corda/enterprise/perftestcordapp/flows/NoSelectionIntegrationTest.kt b/perftestcordapp/src/integrationTest/kotlin/com/r3/corda/enterprise/perftestcordapp/flows/NoSelectionIntegrationTest.kt
index 9638bbbc93..c969e8b588 100644
--- a/perftestcordapp/src/integrationTest/kotlin/com/r3/corda/enterprise/perftestcordapp/flows/NoSelectionIntegrationTest.kt
+++ b/perftestcordapp/src/integrationTest/kotlin/com/r3/corda/enterprise/perftestcordapp/flows/NoSelectionIntegrationTest.kt
@@ -35,7 +35,6 @@ class NoSelectionIntegrationTest {
                 portAllocation = PortAllocation.Incremental(20000)
         )) {
             val alice = startNode(rpcUsers = listOf(aliceUser)).get()
-            defaultNotaryNode.get()
             CordaRPCClient(alice.rpcAddress).use("A", "A") { connection ->
                 connection.proxy.startFlow(::CashIssueAndPaymentNoSelection, 1.DOLLARS, OpaqueBytes.of(0), alice.nodeInfo.legalIdentities[0], false, defaultNotaryIdentity).returnValue.getOrThrow()
             }