diff --git a/src/ui/components/Sidebar.tsx b/src/ui/components/Sidebar.tsx
index 4de96ba60..3935cfae5 100644
--- a/src/ui/components/Sidebar.tsx
+++ b/src/ui/components/Sidebar.tsx
@@ -134,12 +134,12 @@ export default class Sidebar extends Component<SidebarProps, SidebarState> {
 
   render() {
     const {backgroundColor, onResize, position, children} = this.props;
-    let height: number;
-    let minHeight: number;
-    let maxHeight: number;
-    let width: number;
-    let minWidth: number;
-    let maxWidth: number;
+    let height: number | undefined;
+    let minHeight: number | undefined;
+    let maxHeight: number | undefined;
+    let width: number | undefined;
+    let minWidth: number | undefined;
+    let maxWidth: number | undefined;
 
     const resizable: {[key: string]: boolean} = {};
     if (position === 'left') {
diff --git a/src/ui/components/searchable/Searchable.tsx b/src/ui/components/searchable/Searchable.tsx
index 22d15c4f2..78406356a 100644
--- a/src/ui/components/searchable/Searchable.tsx
+++ b/src/ui/components/searchable/Searchable.tsx
@@ -143,7 +143,13 @@ const Searchable = (
     componentDidMount() {
       window.document.addEventListener('keydown', this.onKeyDown);
       const {defaultFilters} = this.props;
-      let savedState;
+      let savedState:
+        | {
+            filters: Array<Filter>;
+            regexEnabled?: boolean;
+            searchTerm?: string;
+          }
+        | undefined;
 
       if (this.getTableKey()) {
         try {
@@ -163,16 +169,19 @@ const Searchable = (
             const filterIndex = savedStateFilters.findIndex(
               f => f.key === defaultFilter.key,
             );
-            if (filterIndex > -1) {
+            const savedDefaultFilter = savedStateFilters[filterIndex];
+            if (filterIndex > -1 && savedDefaultFilter.type === 'enum') {
               if (defaultFilter.type === 'enum') {
-                savedStateFilters[filterIndex].enum = defaultFilter.enum;
+                savedDefaultFilter.enum = defaultFilter.enum;
               }
               const filters = new Set(
-                savedStateFilters[filterIndex].enum.map(filter => filter.value),
+                savedDefaultFilter.enum.map(filter => filter.value),
               );
-              savedStateFilters[filterIndex].value = savedStateFilters[
+              savedStateFilters[
                 filterIndex
-              ].value.filter(value => filters.has(value));
+              ].value = savedDefaultFilter.value.filter(value =>
+                filters.has(value),
+              );
             }
           });
         }
@@ -242,7 +251,7 @@ const Searchable = (
     };
 
     onKeyDown = (e: KeyboardEvent) => {
-      const ctrlOrCmd = e =>
+      const ctrlOrCmd = (e: KeyboardEvent) =>
         (e.metaKey && process.platform === 'darwin') ||
         (e.ctrlKey && process.platform !== 'darwin');
 
diff --git a/src/utils/onRegisterDevice.tsx b/src/utils/onRegisterDevice.tsx
index 266ad326c..4928771e4 100644
--- a/src/utils/onRegisterDevice.tsx
+++ b/src/utils/onRegisterDevice.tsx
@@ -5,7 +5,7 @@
  * @format
  */
 import {Store} from '../reducers/index';
-import {FlipperPlugin, FlipperDevicePlugin, FlipperBasePlugin} from '../plugin';
+import {FlipperPlugin, FlipperDevicePlugin} from '../plugin';
 import {setPluginState} from '../reducers/pluginStates';
 import BaseDevice from '../devices/BaseDevice';
 import {getPersistedState} from '../utils/pluginUtils';
@@ -16,7 +16,9 @@ export function registerDeviceCallbackOnPlugins(
   clientPlugins: Map<string, typeof FlipperPlugin>,
   device: BaseDevice,
 ) {
-  const callRegisterDeviceHook = (plugin: typeof FlipperBasePlugin) => {
+  const callRegisterDeviceHook = (
+    plugin: typeof FlipperDevicePlugin | typeof FlipperPlugin,
+  ) => {
     if (plugin.onRegisterDevice) {
       plugin.onRegisterDevice(
         store,