3 files changed, 9 insertions, 6 deletions

diff --git a/client/src/app/+videos/+video-edit/shared/video-edit-utils.ts b/client/src/app/+videos/+video-edit/shared/video-edit-utils.ts
index db1ef8d73..214bde680 100644
--- a/client/src/app/+videos/+video-edit/shared/video-edit-utils.ts
+++ b/client/src/app/+videos/+video-edit/shared/video-edit-utils.ts
@@ -8,11 +8,11 @@ function hydrateFormFromVideo (formGroup: FormGroup, video: VideoEdit, thumbnail
 
   const objects = [
     {
-      url: 'thumbnailUrl',
+      url: 'thumbnailUrl' as 'thumbnailUrl',
       name: 'thumbnailfile'
     },
     {
-      url: 'previewUrl',
+      url: 'previewUrl' as 'previewUrl',
       name: 'previewfile'
     }
   ]
diff --git a/client/src/app/+videos/+video-watch/shared/comment/video-comments.component.ts b/client/src/app/+videos/+video-watch/shared/comment/video-comments.component.ts
index 28edcfdcb..96bdb28c9 100644
--- a/client/src/app/+videos/+video-watch/shared/comment/video-comments.component.ts
+++ b/client/src/app/+videos/+video-watch/shared/comment/video-comments.component.ts
@@ -263,8 +263,8 @@ export class VideoCommentsComponent implements OnInit, OnChanges, OnDestroy {
       this.syndicationItems = this.videoCommentService.getVideoCommentsFeeds(this.video)
       this.loadMoreThreads()
 
-      if (this.activatedRoute.params['threadId']) {
-        this.processHighlightedThread(+this.activatedRoute.params['threadId'])
+      if (this.activatedRoute.snapshot.params['threadId']) {
+        this.processHighlightedThread(+this.activatedRoute.snapshot.params['threadId'])
       }
     }
   }
diff --git a/client/src/app/+videos/video-list/overview/overview.service.ts b/client/src/app/+videos/video-list/overview/overview.service.ts
index 12d2aa1cb..4a7d9c7c5 100644
--- a/client/src/app/+videos/video-list/overview/overview.service.ts
+++ b/client/src/app/+videos/video-list/overview/overview.service.ts
@@ -5,6 +5,7 @@ import { Injectable } from '@angular/core'
 import { RestExtractor, ServerService } from '@app/core'
 import { immutableAssign } from '@app/helpers'
 import { VideoService } from '@app/shared/shared-main'
+import { objectKeysTyped } from '@shared/core-utils'
 import { peertubeTranslate } from '@shared/core-utils/i18n'
 import { VideosOverview as VideosOverviewServer } from '@shared/models'
 import { environment } from '../../../../environments/environment'
@@ -42,7 +43,7 @@ export class OverviewService {
     }
 
     // Build videos objects
-    for (const key of Object.keys(serverVideosOverview)) {
+    for (const key of objectKeysTyped(serverVideosOverview)) {
       for (const object of serverVideosOverview[key]) {
         observables.push(
           of(object.videos)
@@ -50,7 +51,9 @@ export class OverviewService {
               switchMap(videos => this.videosService.extractVideos({ total: 0, data: videos })),
               map(result => result.data),
               tap(videos => {
-                videosOverviewResult[key].push(immutableAssign(object, { videos }))
+                // FIXME: typings & lint
+                // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
+                videosOverviewResult[key].push(immutableAssign(object, { videos }) as any)
               })
             )
         )