diff --git a/ui/src/components/data-type-select.tsx b/ui/src/components/data-type-select.tsx
index 8e905bf4c..d16c785d8 100644
--- a/ui/src/components/data-type-select.tsx
+++ b/ui/src/components/data-type-select.tsx
@@ -25,7 +25,7 @@ export class DataTypeSelect extends Component<
     this.state = this.emptyState;
   }
 
-  static getDerivedStateFromProps(props) {
+  static getDerivedStateFromProps(props: any): DataTypeSelectProps {
     return {
       type_: props.type_,
     };
diff --git a/ui/src/components/listing-type-select.tsx b/ui/src/components/listing-type-select.tsx
index 6d13f19a1..e9b5a0312 100644
--- a/ui/src/components/listing-type-select.tsx
+++ b/ui/src/components/listing-type-select.tsx
@@ -26,7 +26,7 @@ export class ListingTypeSelect extends Component<
     this.state = this.emptyState;
   }
 
-  static getDerivedStateFromProps(props) {
+  static getDerivedStateFromProps(props: any): ListingTypeSelectProps {
     return {
       type_: props.type_,
     };
diff --git a/ui/src/components/main.tsx b/ui/src/components/main.tsx
index 0560e802e..0392090a5 100644
--- a/ui/src/components/main.tsx
+++ b/ui/src/components/main.tsx
@@ -554,12 +554,12 @@ export class Main extends Component<any, MainState> {
   }
 
   nextPage(i: Main) {
-    i.updateUrl({ page: this.state.page + 1 });
+    i.updateUrl({ page: i.state.page + 1 });
     window.scrollTo(0, 0);
   }
 
   prevPage(i: Main) {
-    i.updateUrl({ page: this.state.page - 1 });
+    i.updateUrl({ page: i.state.page - 1 });
     window.scrollTo(0, 0);
   }