diff --git a/README.md b/README.md
index 3d4685727..71d67e27f 100644
--- a/README.md
+++ b/README.md
@@ -83,7 +83,7 @@ Spark Job Server is now included in Datastax Enterprise 4.8!
 - [Newsweaver](https://www.newsweaver.com)
 - [Instaclustr](http://www.instaclustr.com)
 - [Linkfluence](http://www.linkfluence.com)
-- [SnappyData](http://www.snappydata.io)
+- [SnappyData](https://github.com/TIBCOSoftware/snappydata)
 
 ## Features
 
diff --git a/build.gradle b/build.gradle
index db6069df1..f9cc79cb0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -38,10 +38,12 @@ scalaStyle {
 }
 
 tasks.withType(ScalaCompile) {
-  scalaCompileOptions.additionalParameters = [ '-deprecation', '-feature', '-language:postfixOps', '-language:implicitConversions' ]
+  scalaCompileOptions.deprecation = false
+  scalaCompileOptions.additionalParameters = [ '-feature', '-language:postfixOps', '-language:implicitConversions' ]
 }
 tasks.withType(ScalaDoc) {
-  scalaDocOptions.additionalParameters = [ '-deprecation', '-feature', '-language:postfixOps', '-language:implicitConversions' ]
+  scalaDocOptions.deprecation = false
+  scalaDocOptions.additionalParameters = [ '-feature', '-language:postfixOps', '-language:implicitConversions' ]
 }
 
 dependencies {
diff --git a/job-server/src/spark.jobserver/JobManagerActor.scala b/job-server/src/spark.jobserver/JobManagerActor.scala
index 71004fda9..72c525c20 100644
--- a/job-server/src/spark.jobserver/JobManagerActor.scala
+++ b/job-server/src/spark.jobserver/JobManagerActor.scala
@@ -125,7 +125,8 @@ class JobManagerActor(contextConfig: Config) extends InstrumentedActor {
   private val jobServerNamedObjects = new JobServerNamedObjects(context.system)
 
   override def postStop() {
-    logger.info("Shutting down SparkContext {}", contextName)
+    logger.info("Shutting down job context {} (type = {})", contextName,
+      if (jobContext ne null) jobContext.getClass.getName else "null")
     Option(jobContext).foreach(_.stop())
   }