diff --git a/frontend/app/components/Session/Player/LivePlayer/LivePlayerSubHeader.tsx b/frontend/app/components/Session/Player/LivePlayer/LivePlayerSubHeader.tsx
index 00f7b246b..e1a87b4be 100644
--- a/frontend/app/components/Session/Player/LivePlayer/LivePlayerSubHeader.tsx
+++ b/frontend/app/components/Session/Player/LivePlayer/LivePlayerSubHeader.tsx
@@ -18,9 +18,9 @@ function SubHeader() {
 
   return (
     <>
-      <div className="w-full px-4 py-2 flex items-center border-b min-h-3">
+      <div className="w-full px-4 pt-2 flex items-center border-b min-h-3">
         {tabs.map((tab, i) => (
-          <Tab i={i} tab={tab} currentTab={currentTab} />
+          <Tab i={i} tab={tab} currentTab={tabs.length === 1 ? tab : currentTab} />
         ))}
       </div>
       {location && (
diff --git a/frontend/app/components/Session_/Subheader.js b/frontend/app/components/Session_/Subheader.js
index 42bf2838a..7a8f658eb 100644
--- a/frontend/app/components/Session_/Subheader.js
+++ b/frontend/app/components/Session_/Subheader.js
@@ -105,7 +105,7 @@ function SubHeader(props) {
           <Tab
             i={i}
             tab={tab}
-            currentTab={currentTab}
+            currentTab={tabs.length === 1 ? tab : currentTab}
             changeTab={(changeTo) => player.changeTab(changeTo)}
           />
         ))}
diff --git a/tracker/tracker-assist/package.json b/tracker/tracker-assist/package.json
index f61d88f73..a16bdaa66 100644
--- a/tracker/tracker-assist/package.json
+++ b/tracker/tracker-assist/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@openreplay/tracker-assist",
   "description": "Tracker plugin for screen assistance through the WebRTC",
-  "version": "6.0.1-4",
+  "version": "6.0.1-7",
   "keywords": [
     "WebRTC",
     "assistance",
diff --git a/tracker/tracker-assist/src/Assist.ts b/tracker/tracker-assist/src/Assist.ts
index 4061785a8..5c288cae2 100644
--- a/tracker/tracker-assist/src/Assist.ts
+++ b/tracker/tracker-assist/src/Assist.ts
@@ -282,7 +282,7 @@ export default class Assist {
       setTimeout(() => {
         this.app.start().then(() => { this.assistDemandedRestart = false }).catch(e => app.debug.error(e))
         // TODO: check if it's needed; basically allowing some time for the app to finish everything before starting again
-      }, 350)
+      }, 500)
     })
     socket.on('AGENTS_CONNECTED', (ids: string[]) => {
       ids.forEach(id =>{
@@ -294,7 +294,10 @@ export default class Assist {
       })
       this.assistDemandedRestart = true
       this.app.stop()
-      this.app.start().then(() => { this.assistDemandedRestart = false }).catch(e => app.debug.error(e))
+      setTimeout(() => {
+        this.app.start().then(() => { this.assistDemandedRestart = false }).catch(e => app.debug.error(e))
+        // TODO: check if it's needed; basically allowing some time for the app to finish everything before starting again
+      }, 500)
 
      this.remoteControl?.reconnect(ids)
     })
diff --git a/tracker/tracker/package.json b/tracker/tracker/package.json
index ba6554953..ed95ceb65 100644
--- a/tracker/tracker/package.json
+++ b/tracker/tracker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@openreplay/tracker",
   "description": "The OpenReplay tracker main package",
-  "version": "8.0.0",
+  "version": "8.0.1-0",
   "keywords": [
     "logging",
     "replay"