diff --git a/src/fields/accessPromise.ts b/src/fields/accessPromise.ts
index b63f81df70..218f45028d 100644
--- a/src/fields/accessPromise.ts
+++ b/src/fields/accessPromise.ts
@@ -14,7 +14,7 @@ const accessPromise = async ({
   currentDepth,
   hook,
   payload,
-}: OperationArguments) => {
+}: OperationArguments): Promise<void> => {
   const resultingData = data;
 
   let accessOperation;
diff --git a/src/fields/baseFields/baseAPIKeyFields.ts b/src/fields/baseFields/baseAPIKeyFields.ts
index 507b698f82..e5448feae0 100644
--- a/src/fields/baseFields/baseAPIKeyFields.ts
+++ b/src/fields/baseFields/baseAPIKeyFields.ts
@@ -1,8 +1,8 @@
 import crypto from 'crypto';
 import { Field, FieldHook } from '../config/types';
 
-const encryptKey: FieldHook = ({ req, value }) => (value ? req.payload.encrypt(value) : undefined);
-const decryptKey: FieldHook = ({ req, value }) => (value ? req.payload.decrypt(value) : undefined);
+const encryptKey: FieldHook = ({ req, value }) => (value ? req.payload.encrypt(value as string) : undefined);
+const decryptKey: FieldHook = ({ req, value }) => (value ? req.payload.decrypt(value as string) : undefined);
 
 export default [
   {
@@ -40,7 +40,7 @@ export default [
         async ({ data, req, value }) => {
           if (data.apiKey) {
             return crypto.createHmac('sha1', req.payload.secret)
-              .update(data.apiKey)
+              .update(data.apiKey as string)
               .digest('hex');
           }
           if (data.enableAPIKey === false) {
diff --git a/src/fields/baseFields/baseImageUploadFields.ts b/src/fields/baseFields/baseImageUploadFields.ts
index a110e5eb43..891a76ffcc 100644
--- a/src/fields/baseFields/baseImageUploadFields.ts
+++ b/src/fields/baseFields/baseImageUploadFields.ts
@@ -1,4 +1,4 @@
-import { ImageSize } from '../../collections/config/types';
+import { ImageSize } from '../../uploads/types';
 import { Field } from '../config/types';
 
 export default (imageSizes: ImageSize[]): Field[] => [
diff --git a/src/fields/hookPromise.ts b/src/fields/hookPromise.ts
index 7cac0769cc..a5e151402f 100644
--- a/src/fields/hookPromise.ts
+++ b/src/fields/hookPromise.ts
@@ -8,7 +8,7 @@ const hookPromise = async ({
   operation,
   fullOriginalDoc,
   fullData,
-}: OperationArguments) => {
+}: OperationArguments): Promise<void> => {
   const resultingData = data;
 
   if ((field.type === 'relationship' || field.type === 'upload') && (data[field.name] === 'null' || data[field.name] === null)) {
diff --git a/src/fields/performFieldOperations.ts b/src/fields/performFieldOperations.ts
index 82234444b5..4d969ab28a 100644
--- a/src/fields/performFieldOperations.ts
+++ b/src/fields/performFieldOperations.ts
@@ -4,7 +4,7 @@ import traverseFields from './traverseFields';
 import { Collection } from '../collections/config/types';
 import { OperationArguments } from '../types';
 
-export default async function performFieldOperations(entityConfig: Collection, args: OperationArguments): any {
+export default async function performFieldOperations(entityConfig: Collection, args: OperationArguments): Promise<{ [key: string]: unknown }> {
   const {
     data: fullData,
     originalDoc: fullOriginalDoc,
@@ -49,7 +49,7 @@ export default async function performFieldOperations(entityConfig: Collection, a
   // //////////////////////////////////////////
 
   traverseFields({
-    fields: entityConfig.fields,
+    fields: entityConfig.fields, // TODO: Bad typing, this exists
     data: fullData,
     originalDoc: fullOriginalDoc,
     path: '',
diff --git a/src/fields/relationshipPopulationPromise.ts b/src/fields/relationshipPopulationPromise.ts
index 06e49da4c6..30d9c0705d 100644
--- a/src/fields/relationshipPopulationPromise.ts
+++ b/src/fields/relationshipPopulationPromise.ts
@@ -17,7 +17,7 @@ const populate = async ({
   const dataToUpdate = dataReference;
 
   const fieldAsRelationship = field as RelationshipField;
-  const relation = Array.isArray(fieldAsRelationship.relationTo) ? data.relationTo : fieldAsRelationship.relationTo;
+  const relation = Array.isArray(fieldAsRelationship.relationTo) ? (data.relationTo as string) : fieldAsRelationship.relationTo;
   const relatedCollection = payload.collections[relation];
 
   if (relatedCollection) {
@@ -69,7 +69,7 @@ const relationshipPopulationPromise = ({
   req,
   overrideAccess,
   payload,
-}) => async () => {
+}) => async (): Promise<void> => {
   const resultingData = data;
 
   if (field.hasMany && Array.isArray(data[field.name])) {
diff --git a/src/fields/validationPromise.ts b/src/fields/validationPromise.ts
index 9bad4401d1..3fba7993d4 100644
--- a/src/fields/validationPromise.ts
+++ b/src/fields/validationPromise.ts
@@ -7,7 +7,7 @@ const validationPromise = async ({
   existingData,
   field,
   path,
-}: OperationArguments) => {
+}: OperationArguments): Promise<string | boolean> => {
   if (hook !== 'beforeChange') return true;
 
   const hasCondition = field.admin && field.admin.condition;
diff --git a/src/fields/validations.ts b/src/fields/validations.ts
index 7b7255f3a0..c44045066b 100644
--- a/src/fields/validations.ts
+++ b/src/fields/validations.ts
@@ -59,11 +59,11 @@ export const number: Validator = (value: string, options: NumberOptions = {}) =>
 
 export const text: Validator = (value, options: FieldOptions = {}) => {
   if (options.maxLength && (value && value.length > options.maxLength)) {
-    return `This value must be shorter than the max length of ${options.max} characters.`;
+    return `This value must be shorter than the max length of ${options.maxLength} characters.`;
   }
 
   if (options.minLength && (value && value.length < options.minLength)) {
-    return `This value must be longer than the minimum length of ${options.max} characters.`;
+    return `This value must be longer than the minimum length of ${options.maxLength} characters.`;
   }
 
   if (options.required) {