diff --git a/build.gradle b/build.gradle
index f539d212fe..b9d73bfdf5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
     file("$projectDir/constants.properties").withInputStream { constants.load(it) }
 
     // Our version: bump this on release.
-    ext.corda_release_version = "3.0-NETWORKMAP-SNAPSHOT"
+    ext.corda_release_version = "3.0-SNAPSHOT"
     // Increment this on any release that changes public APIs anywhere in the Corda platform
     ext.corda_platform_version = constants.getProperty("platformVersion")
     ext.gradle_plugins_version = constants.getProperty("gradlePluginsVersion")
diff --git a/constants.properties b/constants.properties
index 60e52a6b0c..a5b866aef0 100644
--- a/constants.properties
+++ b/constants.properties
@@ -1,4 +1,4 @@
-gradlePluginsVersion=3.0.2-NETWORKMAP
+gradlePluginsVersion=3.0.1
 kotlinVersion=1.1.60
 platformVersion=2
 guavaVersion=21.0
diff --git a/node-api/src/main/kotlin/net/corda/nodeapi/internal/config/SSLConfiguration.kt b/node-api/src/main/kotlin/net/corda/nodeapi/internal/config/SSLConfiguration.kt
index b4c8534b93..590b89110d 100644
--- a/node-api/src/main/kotlin/net/corda/nodeapi/internal/config/SSLConfiguration.kt
+++ b/node-api/src/main/kotlin/net/corda/nodeapi/internal/config/SSLConfiguration.kt
@@ -15,5 +15,6 @@ interface SSLConfiguration {
 interface NodeSSLConfiguration : SSLConfiguration {
     val baseDirectory: Path
     override val certificatesDirectory: Path get() = baseDirectory / "certificates"
+    // TODO This will be removed. Instead we will just check against the truststore, which will be provided out-of-band, along with its password
     val rootCertFile: Path get() = certificatesDirectory / "rootcert.pem"
 }