diff --git a/src/app/core/submission/submission-object-data.service.ts b/src/app/core/submission/submission-object-data.service.ts
index 18816fbfd2..59188cb3d7 100644
--- a/src/app/core/submission/submission-object-data.service.ts
+++ b/src/app/core/submission/submission-object-data.service.ts
@@ -57,7 +57,7 @@ export class SubmissionObjectDataService {
         return this.workspaceitemDataService.findById(id, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
       case SubmissionScopeType.WorkflowItem:
         return this.workflowItemDataService.findById(id, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
-      default:
+      default: {
         const now = new Date().getTime();
         return observableOf(new RemoteData(
           now,
@@ -68,6 +68,7 @@ export class SubmissionObjectDataService {
           undefined,
           400
         ));
+      }
     }
   }
 }
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
index ff5a119b6f..958644aa0a 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
@@ -133,9 +133,7 @@ export function dsDynamicFormControlMapFn(model: DynamicFormControlModel): Type<
       return (model instanceof DynamicListCheckboxGroupModel) ? DsDynamicListComponent : DynamicNGBootstrapCheckboxGroupComponent;
 
     case DYNAMIC_FORM_CONTROL_TYPE_DATEPICKER:
-      const datepickerModel = model as DynamicDatePickerModel;
-
-      return datepickerModel.inline ? DynamicNGBootstrapCalendarComponent : DsDatePickerInlineComponent;
+      return (model as DynamicDatePickerModel).inline ? DynamicNGBootstrapCalendarComponent : DsDatePickerInlineComponent;
 
     case DYNAMIC_FORM_CONTROL_TYPE_GROUP:
       return DsDynamicFormGroupComponent;
diff --git a/src/app/shared/testing/auth-request-service.stub.ts b/src/app/shared/testing/auth-request-service.stub.ts
index 0094324518..6349ec40d1 100644
--- a/src/app/shared/testing/auth-request-service.stub.ts
+++ b/src/app/shared/testing/auth-request-service.stub.ts
@@ -51,10 +51,11 @@ export class AuthRequestServiceStub {
   public getRequest(method: string, options?: HttpOptions): Observable<any> {
     const authStatusStub: AuthStatus = new AuthStatus();
     switch (method) {
-      case 'logout':
+      case 'logout': {
         authStatusStub.authenticated = false;
         break;
-      case 'status':
+      }
+      case 'status': {
         const token = ((options.headers as any).lazyUpdate[1]) ? (options.headers as any).lazyUpdate[1].value : null;
         if (this.validateToken(token)) {
           authStatusStub.authenticated = true;
@@ -74,6 +75,7 @@ export class AuthRequestServiceStub {
           authStatusStub.authenticated = false;
         }
         break;
+      }
     }
     return createSuccessfulRemoteDataObject$(authStatusStub);
   }