diff --git a/build.gradle b/build.gradle
index aaafea1715..fc737f327d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -54,10 +54,14 @@ allprojects {
 repositories {
     mavenCentral()
     jcenter()
+    maven {
+        url 'https://dl.bintray.com/kotlin/exposed'
+    }
 }
 
+// Required for building out the fat JAR.
 dependencies {
-    // Required for Quasar. TODO: Remove this dependency.
+    compile project(':node')
     compile "com.google.guava:guava:19.0"
 }
 
@@ -146,6 +150,8 @@ task installTemplateNodes(dependsOn: 'buildCordaJAR') << {
 // TODO: Verify this works for gradle plugins.
 task(install, dependsOn: 'publishToMavenLocal')
 
+quasarScan.dependsOn('classes', ':node:classes', ':core:classes', ':finance:classes')
+
 publishing {
     publications {
         corda(MavenPublication) {
diff --git a/buildSrc/src/main/groovy/QuasarPlugin.groovy b/buildSrc/src/main/groovy/QuasarPlugin.groovy
index 06d3ca7e99..f13b7442ae 100644
--- a/buildSrc/src/main/groovy/QuasarPlugin.groovy
+++ b/buildSrc/src/main/groovy/QuasarPlugin.groovy
@@ -45,7 +45,7 @@ class QuasarPlugin implements Plugin<Project> {
                     classpath: "${project.sourceSets.main.output.classesDir}:${project.sourceSets.main.output.resourcesDir}:${project.configurations.runtime.asPath}")
             project.delete "$project.sourceSets.main.output.resourcesDir/META-INF/suspendables", "$project.sourceSets.main.output.resourcesDir/META-INF/suspendable-supers"
 
-            if(Files.isRegularFile(project.sourceSets.main.output.classesDir)) {
+            if(project.sourceSets.main.output.classesDir.exists()) {
                 ant.scanSuspendables(
                         auto: false,
                         suspendablesFile: "$project.sourceSets.main.output.resourcesDir/META-INF/suspendables",