diff --git a/client/components/ChatUserList.vue b/client/components/ChatUserList.vue
index ec3c971b..ffd5fb39 100644
--- a/client/components/ChatUserList.vue
+++ b/client/components/ChatUserList.vue
@@ -59,7 +59,7 @@
 <script lang="ts">
 import {filter as fuzzyFilter} from "fuzzy";
 import {computed, defineComponent, nextTick, PropType, ref} from "vue";
-import type {UserInMessage} from "../../server/models/msg";
+import type {UserInMessage} from "../../shared/types/msg";
 import type {ClientChan, ClientUser} from "../js/types";
 import Username from "./Username.vue";
 
@@ -104,7 +104,7 @@ export default defineComponent({
 				const result = filteredUsers.value;
 
 				for (const user of result) {
-					const mode = user.original.modes[0] || "";
+					const mode: string = user.original.modes[0] || "";
 
 					if (!groups[mode]) {
 						groups[mode] = [];
diff --git a/client/js/socket-events/more.ts b/client/js/socket-events/more.ts
index bd7dad3e..ddb069dc 100644
--- a/client/js/socket-events/more.ts
+++ b/client/js/socket-events/more.ts
@@ -2,7 +2,7 @@ import {nextTick} from "vue";
 
 import socket from "../socket";
 import {store} from "../store";
-import {ClientMessage} from "../types";
+import {ClientMessage} from "../../../shared/types/msg";
 
 socket.on("more", async (data) => {
 	const channel = store.getters.findChannel(data.chan)?.channel;
@@ -14,12 +14,15 @@ socket.on("more", async (data) => {
 	channel.inputHistory = channel.inputHistory.concat(
 		data.messages
 			.filter((m) => m.self && m.text && m.type === "message")
-			.map((m) => m.text)
+			// TS is too stupid to see the guard in .filter(), so we monkey patch it
+			// to please the compiler
+			.map((m) => (m.text ? m.text : ""))
 			.reverse()
 			.slice(0, 100 - channel.inputHistory.length)
 	);
 	channel.moreHistoryAvailable =
 		data.totalMessages > channel.messages.length + data.messages.length;
+	// TODO: invalid type cast
 	channel.messages.unshift(...(data.messages as ClientMessage[]));
 
 	await nextTick();
diff --git a/client/js/types.d.ts b/client/js/types.d.ts
index 9c941086..f948c66f 100644
--- a/client/js/types.d.ts
+++ b/client/js/types.d.ts
@@ -15,9 +15,7 @@ interface LoungeWindow extends Window {
 	};
 }
 
-type ClientUser = SharedUser & {
-	//
-};
+type ClientUser = SharedUser;
 
 type ClientChan = Omit<SharedChan, "users" | "messages"> & {
 	moreHistoryAvailable: boolean;