diff --git a/src/admin/components/elements/Banner/index.tsx b/src/admin/components/elements/Banner/index.tsx
index 3bea04b684..6e16058e4d 100644
--- a/src/admin/components/elements/Banner/index.tsx
+++ b/src/admin/components/elements/Banner/index.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { Link } from 'react-router-dom';
-import { Props } from './types';
+import { Props, RenderedTypeProps } from './types';
 
 import './index.scss';
 
@@ -25,7 +25,7 @@ const Banner: React.FC<Props> = ({
     icon && `${baseClass}--align-icon-${alignIcon}`,
   ].filter(Boolean).join(' ');
 
-  let RenderedType = 'div';
+  let RenderedType: string | React.ComponentType<RenderedTypeProps> = 'div';
 
   if (onClick && !to) RenderedType = 'button';
   if (to) RenderedType = Link;
@@ -34,7 +34,6 @@ const Banner: React.FC<Props> = ({
     <RenderedType
       className={classes}
       onClick={onClick}
-      type={RenderedType === 'button' ? 'button' : undefined}
       to={to || undefined}
     >
       {(icon && alignIcon === 'left') && (
diff --git a/src/admin/components/elements/Banner/types.ts b/src/admin/components/elements/Banner/types.ts
index a7e366b31e..9cd1d45e7e 100644
--- a/src/admin/components/elements/Banner/types.ts
+++ b/src/admin/components/elements/Banner/types.ts
@@ -1,11 +1,19 @@
 import { MouseEvent } from 'react';
 
+type onClick = (event: MouseEvent) => void
+
 export type Props = {
   children?: React.ReactNode,
   className?: string,
   icon?: React.ReactNode,
   alignIcon?: 'left' | 'right',
-  onClick?: (event: MouseEvent) => void,
+  onClick?: onClick
   to?: string,
   type?: 'error' | 'success' | 'info' | 'default',
 }
+
+export type RenderedTypeProps = {
+  className?: string
+  onClick?: onClick
+  to: string
+}
diff --git a/src/admin/components/elements/ColumnSelector/getInitialState.tsx b/src/admin/components/elements/ColumnSelector/getInitialState.ts
similarity index 70%
rename from src/admin/components/elements/ColumnSelector/getInitialState.tsx
rename to src/admin/components/elements/ColumnSelector/getInitialState.ts
index 041985d494..e2fb7d8a0a 100644
--- a/src/admin/components/elements/ColumnSelector/getInitialState.tsx
+++ b/src/admin/components/elements/ColumnSelector/getInitialState.ts
@@ -1,4 +1,6 @@
-const getInitialColumnState = (fields, useAsTitle, defaultColumns) => {
+import { Field, fieldHasSubFields } from '../../../../fields/config/types';
+
+const getInitialColumnState = (fields: Field[], useAsTitle: string, defaultColumns: string[]): { columns: string[] } => {
   let initialColumns = [];
 
   if (Array.isArray(defaultColumns) && defaultColumns.length >= 1) {
@@ -17,7 +19,7 @@ const getInitialColumnState = (fields, useAsTitle, defaultColumns) => {
       return remaining;
     }
 
-    if (!field.name && Array.isArray(field.fields)) {
+    if (!field.name && fieldHasSubFields(field)) {
       return [
         ...remaining,
         ...field.fields.map((subField) => subField.name),
@@ -39,4 +41,4 @@ const getInitialColumnState = (fields, useAsTitle, defaultColumns) => {
 };
 
 
-module.exports = getInitialColumnState;
+export default getInitialColumnState;
diff --git a/src/admin/components/elements/ColumnSelector/types.ts b/src/admin/components/elements/ColumnSelector/types.ts
index e44d71d2dd..a27578745b 100644
--- a/src/admin/components/elements/ColumnSelector/types.ts
+++ b/src/admin/components/elements/ColumnSelector/types.ts
@@ -1,6 +1,6 @@
-import { Collection } from '../../../../collections/config/types';
+import { CollectionConfig } from '../../../../collections/config/types';
 
 export type Props = {
-  collection: Collection,
+  collection: CollectionConfig,
   handleChange: (columns) => void,
 }
diff --git a/src/admin/components/elements/DatePicker/index.tsx b/src/admin/components/elements/DatePicker/index.tsx
index e1297bc820..1143563725 100644
--- a/src/admin/components/elements/DatePicker/index.tsx
+++ b/src/admin/components/elements/DatePicker/index.tsx
@@ -3,7 +3,7 @@ import Loading from '../Loading';
 
 const DatePicker = lazy(() => import('./DatePicker'));
 
-export default (props) => (
+export default (props: unknown): React.ReactNode => (
   <Suspense fallback={<Loading />}>
     <DatePicker {...props} />
   </Suspense>
diff --git a/src/admin/components/elements/DeleteDocument/index.tsx b/src/admin/components/elements/DeleteDocument/index.tsx
index 8eef3fb4ec..6b96dd5105 100644
--- a/src/admin/components/elements/DeleteDocument/index.tsx
+++ b/src/admin/components/elements/DeleteDocument/index.tsx
@@ -83,7 +83,6 @@ const DeleteDocument: React.FC<Props> = (props) => {
       <React.Fragment>
         <button
           type="button"
-          slug={modalSlug}
           className={`${baseClass}__toggle`}
           onClick={(e) => {
             e.preventDefault();
diff --git a/src/admin/components/elements/DeleteDocument/types.ts b/src/admin/components/elements/DeleteDocument/types.ts
index 80d10a6b5d..c547e160e8 100644
--- a/src/admin/components/elements/DeleteDocument/types.ts
+++ b/src/admin/components/elements/DeleteDocument/types.ts
@@ -1,7 +1,7 @@
-import { Collection } from '../../../../collections/config/types';
+import { CollectionConfig } from '../../../../collections/config/types';
 
 export type Props = {
-  collection?: Collection,
+  collection?: CollectionConfig,
   id?: string,
   title?: string,
 }
diff --git a/src/admin/components/elements/GenerateConfirmation/index.tsx b/src/admin/components/elements/GenerateConfirmation/index.tsx
index f3d9563207..3a5d279301 100644
--- a/src/admin/components/elements/GenerateConfirmation/index.tsx
+++ b/src/admin/components/elements/GenerateConfirmation/index.tsx
@@ -31,7 +31,6 @@ const GenerateConfirmation: React.FC<Props> = (props) => {
       <Button
         size="small"
         buttonStyle="secondary"
-        slug={modalSlug}
         onClick={() => {
           toggle(modalSlug);
         }}
diff --git a/src/admin/components/elements/GenerateConfirmation/types.ts b/src/admin/components/elements/GenerateConfirmation/types.ts
index c22f197100..43e955fb99 100644
--- a/src/admin/components/elements/GenerateConfirmation/types.ts
+++ b/src/admin/components/elements/GenerateConfirmation/types.ts
@@ -1,5 +1,3 @@
-import { createTrue } from 'typescript';
-
 export type Props = {
   setKey: () => void,
   highlightField: (Boolean) => void,
diff --git a/src/admin/components/elements/ListControls/index.tsx b/src/admin/components/elements/ListControls/index.tsx
index 47807b3180..d79af44911 100644
--- a/src/admin/components/elements/ListControls/index.tsx
+++ b/src/admin/components/elements/ListControls/index.tsx
@@ -22,7 +22,6 @@ const ListControls: React.FC<Props> = (props) => {
       fields,
       admin: {
         useAsTitle,
-        defaultColumns,
       },
     },
   } = props;
@@ -31,7 +30,7 @@ const ListControls: React.FC<Props> = (props) => {
   const [search, setSearch] = useState('');
   const [columns, setColumns] = useState([]);
   const [where, setWhere] = useState({});
-  const [visibleDrawer, setVisibleDrawer] = useState(false);
+  const [visibleDrawer, setVisibleDrawer] = useState<'where' | 'sort' | 'columns'>();
 
   useEffect(() => {
     if (useAsTitle) {
@@ -44,7 +43,7 @@ const ListControls: React.FC<Props> = (props) => {
   }, [useAsTitle, fields]);
 
   useEffect(() => {
-    const newState = {
+    const newState: any = {
       columns,
     };
 
@@ -83,7 +82,7 @@ const ListControls: React.FC<Props> = (props) => {
               <Button
                 className={`${baseClass}__toggle-columns`}
                 buttonStyle={visibleDrawer === 'columns' ? undefined : 'secondary'}
-                onClick={() => setVisibleDrawer(visibleDrawer !== 'columns' ? 'columns' : false)}
+                onClick={() => setVisibleDrawer(visibleDrawer !== 'columns' ? 'columns' : undefined)}
                 icon="chevron"
                 iconStyle="none"
               >
@@ -93,7 +92,7 @@ const ListControls: React.FC<Props> = (props) => {
             <Button
               className={`${baseClass}__toggle-where`}
               buttonStyle={visibleDrawer === 'where' ? undefined : 'secondary'}
-              onClick={() => setVisibleDrawer(visibleDrawer !== 'where' ? 'where' : false)}
+              onClick={() => setVisibleDrawer(visibleDrawer !== 'where' ? 'where' : undefined)}
               icon="chevron"
               iconStyle="none"
             >
@@ -103,7 +102,7 @@ const ListControls: React.FC<Props> = (props) => {
               <Button
                 className={`${baseClass}__toggle-sort`}
                 buttonStyle={visibleDrawer === 'sort' ? undefined : 'secondary'}
-                onClick={() => setVisibleDrawer(visibleDrawer !== 'sort' ? 'sort' : false)}
+                onClick={() => setVisibleDrawer(visibleDrawer !== 'sort' ? 'sort' : undefined)}
                 icon="chevron"
                 iconStyle="none"
               >
@@ -120,7 +119,6 @@ const ListControls: React.FC<Props> = (props) => {
         >
           <ColumnSelector
             collection={collection}
-            defaultColumns={defaultColumns}
             handleChange={setColumns}
           />
         </AnimateHeight>
diff --git a/src/admin/components/elements/ListControls/types.ts b/src/admin/components/elements/ListControls/types.ts
index f63be97f9c..3ca68b855d 100644
--- a/src/admin/components/elements/ListControls/types.ts
+++ b/src/admin/components/elements/ListControls/types.ts
@@ -1,9 +1,9 @@
-import { Collection } from '../../../../collections/config/types';
+import { CollectionConfig } from '../../../../collections/config/types';
 
 export type Props = {
   enableColumns?: boolean,
   enableSort?: boolean,
   setSort: () => void,
-  collection: Collection,
+  collection: CollectionConfig,
   handleChange: (newState) => void,
 }
diff --git a/src/admin/components/elements/Localizer/index.tsx b/src/admin/components/elements/Localizer/index.tsx
index 37079e3d52..557a89fce3 100644
--- a/src/admin/components/elements/Localizer/index.tsx
+++ b/src/admin/components/elements/Localizer/index.tsx
@@ -47,7 +47,7 @@ const Localizer: React.FC<Props> = () => {
                     return (
                       <li
                         key={localeOption}
-                        className={localeClasses}
+                        className={localeClasses.join(' ')}
                       >
                         <Link
                           to={{ search }}
diff --git a/src/admin/components/elements/Nav/index.tsx b/src/admin/components/elements/Nav/index.tsx
index 1307d5e8de..8f84df226a 100644
--- a/src/admin/components/elements/Nav/index.tsx
+++ b/src/admin/components/elements/Nav/index.tsx
@@ -127,7 +127,7 @@ const DefaultNav = () => {
   );
 };
 
-const Nav = () => {
+const Nav: React.FC = () => {
   const {
     admin: {
       components: {
diff --git a/src/admin/components/elements/Paginator/index.tsx b/src/admin/components/elements/Paginator/index.tsx
index 2360ad89ac..f7f55098fa 100644
--- a/src/admin/components/elements/Paginator/index.tsx
+++ b/src/admin/components/elements/Paginator/index.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { useHistory, useLocation } from 'react-router-dom';
 import queryString from 'qs';
-import { Props } from './types';
+import { Props, Node } from './types';
 
 import Page from './Page';
 import Separator from './Separator';
@@ -58,7 +58,7 @@ const Pagination: React.FC<Props> = (props) => {
   const rangeEndIndex = (currentPage - 1) + numberOfNeighbors + 1;
 
   // Slice out the range of pages that we want to render
-  const nodes = pages.slice(rangeStartIndex, rangeEndIndex);
+  const nodes: Node[] = pages.slice(rangeStartIndex, rangeEndIndex);
 
   // Add prev separator if necessary
   if (currentPage - numberOfNeighbors - 1 >= 2) nodes.unshift({ type: 'Separator' });
diff --git a/src/admin/components/elements/Paginator/types.ts b/src/admin/components/elements/Paginator/types.ts
index 0a1a192f93..0b84910077 100644
--- a/src/admin/components/elements/Paginator/types.ts
+++ b/src/admin/components/elements/Paginator/types.ts
@@ -8,5 +8,17 @@ export type Props = {
   nextPage?: number,
   numberOfNeighbors?: number,
   disableHistoryChange?: boolean,
-  onChange?: (page) => void,
+  onChange?: (page: number) => void,
 }
+
+export type Node = {
+  type: 'Page' | 'Separator' | 'ClickableArrow'
+  props?: {
+    page?: number
+    updatePage: (page?: number) => void
+    isFirstPage?: boolean
+    isLastPage?: boolean
+    isDisabled?: boolean
+    direction?: 'right' | 'left'
+  }
+} | number
diff --git a/src/admin/components/elements/Pill/index.tsx b/src/admin/components/elements/Pill/index.tsx
index 4475fdf4dd..3125194b6a 100644
--- a/src/admin/components/elements/Pill/index.tsx
+++ b/src/admin/components/elements/Pill/index.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { Link } from 'react-router-dom';
-import { Props } from './types';
+import { Props, RenderedTypeProps } from './types';
 
 import './index.scss';
 
@@ -25,7 +25,7 @@ const Pill: React.FC<Props> = ({
     icon && `${baseClass}--align-icon-${alignIcon}`,
   ].filter(Boolean).join(' ');
 
-  let RenderedType = 'div';
+  let RenderedType: string | React.FC<RenderedTypeProps> = 'div';
 
   if (onClick && !to) RenderedType = 'button';
   if (to) RenderedType = Link;
diff --git a/src/admin/components/elements/Pill/types.ts b/src/admin/components/elements/Pill/types.ts
index 6bd5fab002..ded6e6db74 100644
--- a/src/admin/components/elements/Pill/types.ts
+++ b/src/admin/components/elements/Pill/types.ts
@@ -1,9 +1,15 @@
 export type Props = {
-  children?: React.ReactNode,
   className?: string,
   to?: string,
   icon?: React.ReactNode,
   alignIcon?: 'left' | 'right',
-  onClick?: (onClick) => void,
+  onClick?: () => void,
   pillStyle?: 'light' | 'dark' | 'light-gray',
 }
+
+export type RenderedTypeProps = {
+  className?: string,
+  to: string,
+  onClick?: () => void,
+  type?: 'button'
+}
diff --git a/src/admin/components/elements/Popup/PopupButton/index.tsx b/src/admin/components/elements/Popup/PopupButton/index.tsx
index c87d18a314..4e81b6fb7d 100644
--- a/src/admin/components/elements/Popup/PopupButton/index.tsx
+++ b/src/admin/components/elements/Popup/PopupButton/index.tsx
@@ -28,7 +28,7 @@ const PopupButton: React.FC<Props> = (props) => {
     return (
       <div
         role="button"
-        tabIndex="0"
+        tabIndex={0}
         onKeyDown={(e) => { if (e.key === 'Enter') handleClick(); }}
         onClick={handleClick}
         className={classes}
diff --git a/src/admin/components/elements/Popup/PopupButton/types.ts b/src/admin/components/elements/Popup/PopupButton/types.ts
index 9eba4a66ff..ac602f7898 100644
--- a/src/admin/components/elements/Popup/PopupButton/types.ts
+++ b/src/admin/components/elements/Popup/PopupButton/types.ts
@@ -1,7 +1,7 @@
 export type Props = {
     buttonType: 'custom' | 'default',
     button: React.ReactNode,
-    setActive: () => void,
+    setActive: (active: boolean) => void,
     active: boolean,
-    onToggleOpen: () => void,
+    onToggleOpen: (active: boolean) => void,
 }
diff --git a/src/admin/components/elements/PreviewButton/index.tsx b/src/admin/components/elements/PreviewButton/index.tsx
index 08962e03de..c2332603e3 100644
--- a/src/admin/components/elements/PreviewButton/index.tsx
+++ b/src/admin/components/elements/PreviewButton/index.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
-import { useForm } from '../../forms/Form/context';
 import { useAuth } from '@payloadcms/config-provider';
+import { useForm } from '../../forms/Form/context';
 import Button from '../Button';
 import { Props } from './types';
 
diff --git a/src/admin/components/elements/ReactSelect/index.tsx b/src/admin/components/elements/ReactSelect/index.tsx
index 51e6f282f9..e0cf88f3f6 100644
--- a/src/admin/components/elements/ReactSelect/index.tsx
+++ b/src/admin/components/elements/ReactSelect/index.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
-import Select from 'react-select';
-import { Props } from './types';
+import Select, { ValueType, OptionsType } from 'react-select';
+import { Props, Value } from './types';
 import Chevron from '../../icons/Chevron';
 
 import './index.scss';
@@ -9,7 +9,6 @@ const ReactSelect: React.FC<Props> = (props) => {
   const {
     showError = false,
     options,
-    isMulti = false,
     onChange,
     value,
     disabled = false,
@@ -25,13 +24,13 @@ const ReactSelect: React.FC<Props> = (props) => {
     <Select
       {...props}
       value={value}
-      onChange={(selected) => {
+      onChange={(selected: ValueType<Value>) => {
         if (formatValue) {
           onChange(formatValue(selected));
         } else {
-          let valueToChange;
+          let valueToChange: string | string[];
 
-          if (isMulti) {
+          if (Array.isArray(selected)) {
             if (selected) {
               valueToChange = selected.map((selectedOption) => {
                 if (typeof selectedOption === 'string') {
@@ -45,7 +44,7 @@ const ReactSelect: React.FC<Props> = (props) => {
               });
             }
           } else if (selected) {
-            valueToChange = selected.value;
+            valueToChange = (selected as Value).value;
           }
           onChange(valueToChange);
         }
@@ -54,20 +53,19 @@ const ReactSelect: React.FC<Props> = (props) => {
       components={{ DropdownIndicator: Chevron }}
       className={classes}
       classNamePrefix="rs"
-      options={options.map((option) => {
-        const formattedOption = {
-          value: option,
-          label: option,
-        };
-
-        if (typeof option === 'object') {
-          formattedOption.value = option.value;
-          formattedOption.label = option.label;
-
-          if (option.options) formattedOption.options = option.options;
+      options={(options as OptionsType<Value>).map((option) => {
+        if (typeof option === 'string') {
+          return {
+            value: option,
+            label: option,
+          };
         }
 
-        return formattedOption;
+        return {
+          value: option.value,
+          label: option.label,
+          options: option?.options,
+        };
       })}
     />
   );
diff --git a/src/admin/components/elements/ReactSelect/types.ts b/src/admin/components/elements/ReactSelect/types.ts
index 883c959b53..0d4a6d7bb2 100644
--- a/src/admin/components/elements/ReactSelect/types.ts
+++ b/src/admin/components/elements/ReactSelect/types.ts
@@ -1,9 +1,18 @@
+import { ValueType, OptionsType, GroupedOptionsType } from 'react-select';
+
+export type Value = {
+  label: string
+  value: string
+  options?: Value[]
+}
+
 export type Props = {
-  value?: string | [],
-  onChange?: (formatValue) => void,
+  value?: ValueType<Value>,
+  onChange?: (value: any) => void,
   disabled?: boolean,
   showError?: boolean,
-  formatValue?: () => void,
-  options?: string[] | { value: string, label: string }[],
+  formatValue?: (value: ValueType<Value>) => string[] | string,
+  options: OptionsType<Value> | GroupedOptionsType<Value>
   isMulti?: boolean,
+  isDisabled?: boolean
 }
diff --git a/src/admin/components/elements/SortComplex/types.ts b/src/admin/components/elements/SortComplex/types.ts
index 62da384c23..b29c93f435 100644
--- a/src/admin/components/elements/SortComplex/types.ts
+++ b/src/admin/components/elements/SortComplex/types.ts
@@ -1,6 +1,6 @@
-import { Collection } from '../../../../collections/config/types';
+import { CollectionConfig } from '../../../../collections/config/types';
 
 export type Props = {
-  handleChange: (any) => void,
-  collection: Collection,
+  handleChange: (controls: any) => void,
+  collection: CollectionConfig,
 }
diff --git a/src/admin/components/elements/Table/index.tsx b/src/admin/components/elements/Table/index.tsx
index 78bbd99c7e..48c895a452 100644
--- a/src/admin/components/elements/Table/index.tsx
+++ b/src/admin/components/elements/Table/index.tsx
@@ -12,7 +12,6 @@ const Table: React.FC<Props> = ({ columns, data }) => {
         <table
           cellPadding="0"
           cellSpacing="0"
-          border="0"
         >
           <thead>
             <tr>
diff --git a/src/admin/components/elements/Table/types.ts b/src/admin/components/elements/Table/types.ts
index 2babc175f7..df9fcd4424 100644
--- a/src/admin/components/elements/Table/types.ts
+++ b/src/admin/components/elements/Table/types.ts
@@ -1,9 +1,11 @@
+import React from 'react';
+
 export type Props = {
   columns: {
       accessor: string,
       components: {
         Heading: React.ReactNode,
-        renderCell: () => void,
+        renderCell: (row: any, data: any) => React.ReactNode,
       },
     }[],
   data: []
diff --git a/src/admin/components/elements/Thumbnail/index.tsx b/src/admin/components/elements/Thumbnail/index.tsx
index b8daed4ac1..fde13598b1 100644
--- a/src/admin/components/elements/Thumbnail/index.tsx
+++ b/src/admin/components/elements/Thumbnail/index.tsx
@@ -13,7 +13,7 @@ const Thumbnail: React.FC<Props> = (props) => {
     filename,
     mimeType,
     staticURL,
-    sizes = 'medium',
+    sizes,
     adminThumbnail,
     size,
   } = props;
diff --git a/src/admin/components/elements/Thumbnail/types.ts b/src/admin/components/elements/Thumbnail/types.ts
index b848570020..443a8c5dd6 100644
--- a/src/admin/components/elements/Thumbnail/types.ts
+++ b/src/admin/components/elements/Thumbnail/types.ts
@@ -1,6 +1,8 @@
+import { FileSizes } from '../../../../uploads/types';
+
 export type Props = {
   filename: string,
-  sizes?: unknown,
+  sizes?: FileSizes
   adminThumbnail?: string,
   mimeType?: string,
   staticURL: string,
diff --git a/src/admin/components/elements/UploadCard/index.tsx b/src/admin/components/elements/UploadCard/index.tsx
index 8a71d310e1..1155826e2c 100644
--- a/src/admin/components/elements/UploadCard/index.tsx
+++ b/src/admin/components/elements/UploadCard/index.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable jsx-a11y/click-events-have-key-events */
 import React from 'react';
 import { Props } from './types';
 import Thumbnail from '../Thumbnail';
diff --git a/src/admin/components/elements/UploadCard/types.ts b/src/admin/components/elements/UploadCard/types.ts
index 5178b28c29..a715d2be76 100644
--- a/src/admin/components/elements/UploadCard/types.ts
+++ b/src/admin/components/elements/UploadCard/types.ts
@@ -1,10 +1,11 @@
-import { Collection } from '../../../../collections/config/types';
+import { CollectionConfig } from '../../../../collections/config/types';
+import { FileSizes } from '../../../../uploads/types';
 
 export type Props = {
-  collection: Collection,
+  collection: CollectionConfig,
   id: string,
   filename: string,
   mimeType: string,
-  sizes?: unknown,
+  sizes?: FileSizes,
   onClick?: () => void,
 }
diff --git a/src/admin/components/elements/WhereBuilder/reducer.tsx b/src/admin/components/elements/WhereBuilder/reducer.ts
similarity index 100%
rename from src/admin/components/elements/WhereBuilder/reducer.tsx
rename to src/admin/components/elements/WhereBuilder/reducer.ts
diff --git a/src/admin/components/elements/WhereBuilder/types.ts b/src/admin/components/elements/WhereBuilder/types.ts
index f7e1e15d0f..b29c93f435 100644
--- a/src/admin/components/elements/WhereBuilder/types.ts
+++ b/src/admin/components/elements/WhereBuilder/types.ts
@@ -1,6 +1,6 @@
-import { Collection } from '../../../../collections/config/types';
+import { CollectionConfig } from '../../../../collections/config/types';
 
 export type Props = {
-  handleChange: () => void,
-  collection: Collection,
+  handleChange: (controls: any) => void,
+  collection: CollectionConfig,
 }
diff --git a/src/admin/components/forms/Form/buildStateFromSchema.ts b/src/admin/components/forms/Form/buildStateFromSchema.ts
index 983c543572..31e6e554df 100644
--- a/src/admin/components/forms/Form/buildStateFromSchema.ts
+++ b/src/admin/components/forms/Form/buildStateFromSchema.ts
@@ -4,11 +4,13 @@ import { Fields, Field, Data } from './types';
 const buildValidationPromise = async (fieldState: Field, field: FieldSchema) => {
   const validatedFieldState = fieldState;
 
-  validatedFieldState.valid = typeof field.validate === 'function' ? await field.validate(fieldState.value, field) : true;
+  const validationResult = typeof field.validate === 'function' ? await field.validate(fieldState.value, field) : true;
 
-  if (typeof validatedFieldState.valid === 'string') {
-    validatedFieldState.errorMessage = validatedFieldState.valid;
+  if (typeof validationResult === 'string') {
+    validatedFieldState.errorMessage = validationResult;
     validatedFieldState.valid = false;
+  } else {
+    validatedFieldState.valid = true;
   }
 };
 
@@ -86,7 +88,7 @@ const buildStateFromSchema = async (fieldSchema: FieldSchema[], fullData: Data =
         }
 
         // Handle non-array-based nested fields (group, etc)
-        if (field.type === 'row' || field.type === 'group') {
+        if (field.type === 'group') {
           const subFieldData = initialData?.[field.name] as Data;
 
           return {
@@ -102,7 +104,7 @@ const buildStateFromSchema = async (fieldSchema: FieldSchema[], fullData: Data =
       }
 
       // Handle field types that do not use names (row, etc)
-      if (field.type === 'row' || field.type === 'group') {
+      if (field.type === 'row') {
         return {
           ...state,
           ...iterateFields(field.fields, data, path),
diff --git a/src/admin/components/forms/field-types/Select/index.tsx b/src/admin/components/forms/field-types/Select/index.tsx
index f875c27025..58d768fc97 100644
--- a/src/admin/components/forms/field-types/Select/index.tsx
+++ b/src/admin/components/forms/field-types/Select/index.tsx
@@ -6,6 +6,7 @@ import useFieldType from '../../useFieldType';
 import Label from '../../Label';
 import Error from '../../Error';
 import { select } from '../../../../../fields/validations';
+import { Props } from './types';
 
 import './index.scss';
 
@@ -62,7 +63,7 @@ const formatRenderValue = (value, options) => {
   return value;
 };
 
-const Select = (props) => {
+const Select: React.FC<Props> = (props) => {
   const {
     path: pathFromProps,
     name,
diff --git a/src/admin/components/forms/field-types/Select/types.ts b/src/admin/components/forms/field-types/Select/types.ts
new file mode 100644
index 0000000000..98e14b5fae
--- /dev/null
+++ b/src/admin/components/forms/field-types/Select/types.ts
@@ -0,0 +1,17 @@
+import React from 'react';
+import { Validate } from '../../../../../fields/config/types';
+
+export type Props = {
+  path?: string
+  name: string
+  required?: boolean
+  validate?: Validate
+  label?: string
+  options?: string[] | { label: string, value: string }[]
+  hasMany?: boolean
+  admin?: {
+    readOnly?: boolean
+    width?: string
+    style?: React.CSSProperties
+  }
+}
diff --git a/src/fields/config/types.ts b/src/fields/config/types.ts
index 3c5c464e29..476fa61ba7 100644
--- a/src/fields/config/types.ts
+++ b/src/fields/config/types.ts
@@ -195,3 +195,12 @@ export type Field =
 export type FieldWithPath = Field & {
   path?: string
 }
+
+export type FieldWithSubFields =
+  GroupField
+  | ArrayField
+  | RowField;
+
+export function fieldHasSubFields(field: Field): field is FieldWithSubFields {
+  return (field.type === 'group' || field.type === 'array' || field.type === 'row');
+}
diff --git a/src/uploads/getThumbnail.ts b/src/uploads/getThumbnail.ts
index 6b55743f5a..26cc0e2faf 100644
--- a/src/uploads/getThumbnail.ts
+++ b/src/uploads/getThumbnail.ts
@@ -1,7 +1,7 @@
 import isImage from './isImage';
-import { FileData } from './types';
+import { FileSizes } from './types';
 
-const getThumbnail = (mimeType: string, staticURL: string, filename: string, sizes: FileData[], adminThumbnail: string): string | boolean => {
+const getThumbnail = (mimeType: string, staticURL: string, filename: string, sizes: FileSizes, adminThumbnail: string): string | boolean => {
   if (isImage(mimeType)) {
     if (sizes?.[adminThumbnail]?.filename) {
       return `${staticURL}/${sizes[adminThumbnail].filename}`;