diff --git a/build.gradle b/build.gradle
index 2806c48f48..07a99bf735 100644
--- a/build.gradle
+++ b/build.gradle
@@ -350,7 +350,7 @@ bintrayConfig {
     projectUrl = 'https://github.com/corda/corda'
     gpgSign = true
     gpgPassphrase = System.getenv('CORDA_BINTRAY_GPG_PASSPHRASE')
-    publications = ['corda-jfx', 'corda-mock', 'corda-rpc', 'corda-core', 'corda', 'corda-finance', 'corda-node', 'corda-node-api', 'corda-test-common', 'corda-test-utils', 'corda-jackson', 'corda-verifier', 'corda-webserver-impl', 'corda-webserver', 'corda-node-driver', 'corda-confidential-identities', 'doorman', 'doorman-hsm']
+    publications = ['corda-jfx', 'corda-mock', 'corda-rpc', 'corda-core', 'corda', 'corda-finance', 'corda-node', 'corda-node-api', 'corda-test-common', 'corda-test-utils', 'corda-jackson', 'corda-verifier', 'corda-webserver-impl', 'corda-webserver', 'corda-node-driver', 'corda-confidential-identities', 'doorman', 'doorman-hsm', 'corda-shell']
     license {
         name = 'Apache-2.0'
         url = 'https://www.apache.org/licenses/LICENSE-2.0'
diff --git a/docs/source/tutorial-observer-nodes.rst b/docs/source/tutorial-observer-nodes.rst
index 52c7a5e67c..85940ac24c 100644
--- a/docs/source/tutorial-observer-nodes.rst
+++ b/docs/source/tutorial-observer-nodes.rst
@@ -38,11 +38,11 @@ reports from their database and observe new transactions coming in via RPC.
 Caveats
 -------
 
-* Nodes which act as both observers and direct participants in the ledger are not supported at this time. In
-  particular, coin selection may return states which you do not have the private keys to be able to sign for. Future
-  versions of Corda may address this issue, but for now, if you wish to both participate in the ledger and also observe
-  transactions that you can't sign for you will need to run two nodes and have two separate identities
+* By default, vault queries do not differentiate between states you recorded as a participant/owner, and states you 
+  recorded as an observer. You will have to write custom vault queries that only return states for which you are a 
+  participant/owner. See https://docs.corda.net/api-vault-query.html#example-usage for information on how to do this. 
+  This also means that ``Cash.generateSpend`` should not be used when recording ``Cash.State`` states as an observer
 
 * Nodes only record each transaction once. If a node has already recorded a transaction in non-observer mode, it cannot
   later re-record the same transaction as an observer. This issue is tracked here:
-  https://r3-cev.atlassian.net/browse/CORDA-883
\ No newline at end of file
+  https://r3-cev.atlassian.net/browse/CORDA-883
diff --git a/tools/shell/build.gradle b/tools/shell/build.gradle
index 73c5aafb16..7a0721593f 100644
--- a/tools/shell/build.gradle
+++ b/tools/shell/build.gradle
@@ -2,6 +2,7 @@ apply plugin: 'kotlin'
 apply plugin: 'java'
 apply plugin: 'application'
 apply plugin: 'net.corda.plugins.quasar-utils'
+apply plugin: 'net.corda.plugins.publish-utils'
 
 description 'Corda Shell'
 
@@ -90,3 +91,7 @@ task integrationTest(type: Test) {
     testClassesDirs = sourceSets.integrationTest.output.classesDirs
     classpath = sourceSets.integrationTest.runtimeClasspath
 }
+
+publish {
+    name jar.baseName
+}
\ No newline at end of file