diff --git a/kate/ollie_kate.cpp b/kate/ollie_kate.cpp
index da6667f..2efe877 100644
--- a/kate/ollie_kate.cpp
+++ b/kate/ollie_kate.cpp
@@ -669,7 +669,7 @@ void OllieKateView::renameSession()
     if (!ok || newName.trimmed().isEmpty()) return;
     newName = newName.trimmed();
 
-    write9p(agentPath() + "/ctl", ("rn " + newName).toUtf8());
+    write9p("session/" + m_sessionId + "/ctl", ("rn " + newName).toUtf8());
     {
         m_sessionId = newName;
         QString stateVal = QString::fromUtf8(run9p({"read", agentPath() + "/state"})).trimmed();
diff --git a/krunner/ollie_runner.cpp b/krunner/ollie_runner.cpp
index 24c8cd5..8cd5ec7 100644
--- a/krunner/ollie_runner.cpp
+++ b/krunner/ollie_runner.cpp
@@ -74,10 +74,7 @@ QStringList OllieRunner::listSessions()
 
 void OllieRunner::killSession(const QString &id)
 {
-    // Find agent path
-    QByteArray agentOut = run9p({"ls", "session/" + id + "/agent"});
-    QString agentId = QString::fromUtf8(agentOut).trimmed().split('\n').value(0, "0");
-    write9p("session/" + id + "/agent/" + agentId + "/ctl", "kill");
+    write9p("session/" + id + "/ctl", "kill");
 }
 
 void OllieRunner::match(RunnerNS::RunnerContext &context)