diff --git a/src/classes/PublicBot.ts b/src/classes/PublicBot.ts
index d705e655..039a378a 100644
--- a/src/classes/PublicBot.ts
+++ b/src/classes/PublicBot.ts
@@ -20,7 +20,12 @@ export class PublicBot {
     this.#client = client;
     this.id = data._id;
     this.username = data.username;
-    this.avatar = data.avatar ? new File(client, data.avatar) : undefined;
+    this.avatar = data.avatar
+      ? new File(client, {
+          _id: data.avatar,
+          tag: "avatars",
+        } as API.File)
+      : undefined;
     this.description = data.description!;
   }
 
diff --git a/src/classes/Server.ts b/src/classes/Server.ts
index c0f1237a..4fef4ad7 100644
--- a/src/classes/Server.ts
+++ b/src/classes/Server.ts
@@ -1,6 +1,7 @@
 import { batch } from "solid-js";
 
 import type {
+  AllMemberResponse,
   Category,
   DataBanCreate,
   DataCreateChannel,
@@ -590,9 +591,10 @@ export class Server {
    * @returns List of the server's members and their user objects
    */
   async fetchMembers() {
-    const data = await this.#collection.client.api.get(
+    const data = (await this.#collection.client.api.get(
+      // @ts-expect-error TODO weird typing issue
       `/servers/${this.id as ""}/members`
-    );
+    )) as AllMemberResponse;
 
     return batch(() => ({
       members: data.members.map((member) =>
diff --git a/src/collections/ServerCollection.ts b/src/collections/ServerCollection.ts
index dd292640..a6d4edab 100644
--- a/src/collections/ServerCollection.ts
+++ b/src/collections/ServerCollection.ts
@@ -21,7 +21,10 @@ export class ServerCollection extends ClassCollection<Server, HydratedServer> {
   async fetch(id: string): Promise<Server> {
     const server = this.get(id);
     if (server) return server;
-    const data = await this.client.api.get(`/servers/${id as ""}`);
+    const data = (await this.client.api.get(
+      // @ts-expect-error TODO weird typing issue
+      `/servers/${id as ""}`
+    )) as API.Server;
     return this.getOrCreate(data._id, data);
   }