diff --git a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/TruffleRLanguage.java b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/TruffleRLanguage.java
index a0885395fdbcdeb7338b92796840afd50eb0bf7f..b61eb0c18adc3fbbf422abfe61354c97fd53cbe4 100644
--- a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/TruffleRLanguage.java
+++ b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/TruffleRLanguage.java
@@ -41,6 +41,7 @@ import com.oracle.truffle.r.engine.interop.RForeignAccessFactoryImpl;
 import com.oracle.truffle.r.nodes.RASTBuilder;
 import com.oracle.truffle.r.nodes.builtin.RBuiltinPackages;
 import com.oracle.truffle.r.nodes.instrumentation.RSyntaxTags;
+import com.oracle.truffle.r.nodes.qirinterface.QIRInterface;
 import com.oracle.truffle.r.runtime.ExitException;
 import com.oracle.truffle.r.runtime.FastROptions;
 import com.oracle.truffle.r.runtime.RAccuracyInfo;
@@ -129,6 +130,7 @@ public final class TruffleRLanguage extends TruffleLanguage<RContext> {
 
     @Override
     protected void disposeContext(RContext context) {
+        QIRInterface.closeDrivers();
         context.destroy();
     }
 
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/query/RTableBuiltin.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/query/RTableBuiltin.java
index 2e4ac6ab46ecf726ea755fa4d0a0c5e2fa7448de..dcdaf1bfe45cdceb3999636c01bb6bc319e2392a 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/query/RTableBuiltin.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/query/RTableBuiltin.java
@@ -47,7 +47,6 @@ public abstract class RTableBuiltin extends RBuiltinNode {
             res.put("configFile", configFile);
             res.put("schemaName", schemaName);
         } catch (PutException e) {
-            // TODO Auto-generated catch block
             e.printStackTrace();
         }
         return res;