diff --git a/npm/ng-packs/packages/core/src/lib/services/router-events.service.ts b/npm/ng-packs/packages/core/src/lib/services/router-events.service.ts
index 6203bad3bb..5e2db89899 100644
--- a/npm/ng-packs/packages/core/src/lib/services/router-events.service.ts
+++ b/npm/ng-packs/packages/core/src/lib/services/router-events.service.ts
@@ -22,9 +22,8 @@ export class RouterEvents {
   constructor(private router: Router) {}
 
   getEvents<T extends RouterEventConstructors>(...eventTypes: T) {
-    type FilteredRouterEvent = T extends Type<infer Ctor>[] ? Ctor : never;
 
-    const filterRouterEvents = (event: Event): event is FilteredRouterEvent =>
+    const filterRouterEvents = (event: Event) =>
       eventTypes.some(type => event instanceof type);
 
     return this.router.events.pipe(filter(filterRouterEvents));
diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/utils/form-props.util.ts b/npm/ng-packs/packages/theme-shared/extensions/src/lib/utils/form-props.util.ts
index 617770f081..c1295f21fa 100644
--- a/npm/ng-packs/packages/theme-shared/extensions/src/lib/utils/form-props.util.ts
+++ b/npm/ng-packs/packages/theme-shared/extensions/src/lib/utils/form-props.util.ts
@@ -17,7 +17,7 @@ export function generateFormFromProps<R = any>(data: PropData<R>) {
   const extraForm = new UntypedFormGroup({});
   form.addControl(EXTRA_PROPERTIES_KEY, extraForm);
 
-  const record = data.record || {} as {[key:string]: any};
+  const record = data.record || {};
   const type = JSON.stringify(record) === '{}' ? 'create' : 'edit';
   const props: FormPropList<R> = extensions[`${type}FormProps`].get(identifier).props;
   const extraProperties = record[EXTRA_PROPERTIES_KEY] || {};