diff --git a/verify-enclave/build.gradle b/verify-enclave/build.gradle
index f113c34211..85bbc5e646 100644
--- a/verify-enclave/build.gradle
+++ b/verify-enclave/build.gradle
@@ -1,5 +1,4 @@
 apply plugin: 'kotlin'
-apply plugin: 'net.corda.plugins.quasar-utils'
 
 repositories {
     mavenLocal()
@@ -54,6 +53,11 @@ jar {
         configurations.compile.collect { it.isDirectory() ? it : zipTree(it) }
     }
     archiveName "corda-enclavelet.jar"
+    manifest {
+        attributes(
+            'Main-Class': 'com.r3.enclaves.txverify.Enclavelet',
+        )
+    }
 }
 
 task integrationTest(type: Test) {
diff --git a/verify-enclave/src/main/kotlin/com/r3/enclaves/txverify/Enclavelet.kt b/verify-enclave/src/main/kotlin/com/r3/enclaves/txverify/Enclavelet.kt
index 4905285b08..0e321d4285 100644
--- a/verify-enclave/src/main/kotlin/com/r3/enclaves/txverify/Enclavelet.kt
+++ b/verify-enclave/src/main/kotlin/com/r3/enclaves/txverify/Enclavelet.kt
@@ -44,6 +44,7 @@ fun verifyInEnclave(reqBytes: ByteArray) {
 // Note: This is only here for debugging purposes
 fun main(args: Array<String>) {
     Log.TRACE()
+    Class.forName("com.r3.enclaves.txverify.KryoVerifierSerializationScheme")
     val reqBytes = File(args[0]).readBytes()
     verifyInEnclave(reqBytes)
 }
\ No newline at end of file
diff --git a/verify-enclave/src/main/kotlin/com/r3/enclaves/txverify/KryoSerializationScheme.kt b/verify-enclave/src/main/kotlin/com/r3/enclaves/txverify/KryoVerifierSerializationScheme.kt
similarity index 96%
rename from verify-enclave/src/main/kotlin/com/r3/enclaves/txverify/KryoSerializationScheme.kt
rename to verify-enclave/src/main/kotlin/com/r3/enclaves/txverify/KryoVerifierSerializationScheme.kt
index 13c9c2c16b..b81352281d 100644
--- a/verify-enclave/src/main/kotlin/com/r3/enclaves/txverify/KryoSerializationScheme.kt
+++ b/verify-enclave/src/main/kotlin/com/r3/enclaves/txverify/KryoVerifierSerializationScheme.kt
@@ -2,7 +2,6 @@ package com.r3.enclaves.txverify
 
 import net.corda.core.serialization.SerializationContext
 import net.corda.core.serialization.SerializationDefaults
-import net.corda.core.serialization.SerializationFactory
 import net.corda.core.utilities.ByteSequence
 import net.corda.nodeapi.internal.serialization.AbstractKryoSerializationScheme
 import net.corda.nodeapi.internal.serialization.KRYO_P2P_CONTEXT