diff --git a/readme.md b/readme.md
index e8a8e7e..8c9fc90 100644
--- a/readme.md
+++ b/readme.md
@@ -38,7 +38,6 @@ For more information about features, [see the user guide.](https://gitdab.com/ca
 
 * This bridge is not designed for puppetting.
 * Direct Messaging is not supported until I figure out a good way of doing it.
-* Encrypted messages are not supported. Decryption is often unreliable on Matrix, and your messages end up in plaintext on Discord anyway, so there's not much advantage.
 
 ## Get started!
 
diff --git a/scripts/estimate-size.js b/scripts/estimate-size.js
deleted file mode 100644
index 341abc0..0000000
--- a/scripts/estimate-size.js
+++ /dev/null
@@ -1,65 +0,0 @@
-// @ts-check
-
-const pb = require("prettier-bytes")
-const sqlite = require("better-sqlite3")
-const HeatSync = require("heatsync")
-
-const {reg} = require("../src/matrix/read-registration")
-const passthrough = require("../src/passthrough")
-
-const sync = new HeatSync({watchFS: false})
-Object.assign(passthrough, {reg, sync})
-
-const DiscordClient = require("../src/d2m/discord-client")
-
-const discord = new DiscordClient(reg.ooye.discord_token, "no")
-passthrough.discord = discord
-
-const db = new sqlite("ooye.db")
-passthrough.db = db
-
-const api = require("../src/matrix/api")
-
-const {room: roomID} = require("minimist")(process.argv.slice(2), {string: ["room"]})
-if (!roomID) {
-	console.error("Usage: ./scripts/estimate-size.js --room=<!room id here>")
-	process.exit(1)
-}
-
-const {channel_id, guild_id} = db.prepare("SELECT channel_id, guild_id FROM channel_room WHERE room_id = ?").get(roomID)
-
-const max = 1000
-
-;(async () => {
-	let total = 0
-	let size = 0
-	let from
-
-	while (total < max) {
-		const events = await api.getEvents(roomID, "b", {limit: 1000, from})
-		total += events.chunk.length
-		from = events.end
-		console.log(`Fetched ${total} events so far`)
-
-		for (const e of events.chunk) {
-			if (e.content?.info?.size) {
-				size += e.content.info.size
-			}
-		}
-
-		if (events.chunk.length === 0 || !events.end) break
-	}
-
-	console.log(`Total size of uploads: ${pb(size)}`)
-
-	const searchResults = await discord.snow.requestHandler.request(`/guilds/${guild_id}/messages/search`, {
-		channel_id,
-		offset: "0",
-		limit: "1"
-	}, "get", "json")
-
-	const totalAllTime = searchResults.total_results
-	const fractionCounted = total / totalAllTime
-	console.log(`That counts for ${(fractionCounted*100).toFixed(2)}% of the history on Discord (${totalAllTime.toLocaleString()} messages)`)
-	console.log(`The size of uploads for the whole history would be approx: ${pb(Math.floor(size/total*totalAllTime))}`)
-})()
diff --git a/src/matrix/api.js b/src/matrix/api.js
index 87bbf0c..70cb50b 100644
--- a/src/matrix/api.js
+++ b/src/matrix/api.js
@@ -136,7 +136,7 @@ async function getEventForTimestamp(roomID, ts) {
  */
 async function getEvents(roomID, dir, pagination = {}, filter) {
 	filter = filter && JSON.stringify(filter)
-	/** @type {Ty.MessagesPagination<Ty.Event.Outer<any>>} */
+	/** @type {Ty.Pagination<Ty.Event.Outer<any>>} */
 	const root = await mreq.mreq("GET", path(`/client/v3/rooms/${roomID}/messages`, null, {...pagination, dir, filter}))
 	return root
 }
diff --git a/src/types.d.ts b/src/types.d.ts
index 7dc92d6..e36241f 100644
--- a/src/types.d.ts
+++ b/src/types.d.ts
@@ -501,13 +501,7 @@ export type Membership = "invite" | "knock" | "join" | "leave" | "ban"
 export type Pagination<T> = {
 	chunk: T[]
 	next_batch?: string
-	prev_batch?: string
-}
-
-export type MessagesPagination<T> = {
-	chunk: T[]
-	start: string
-	end?: string
+	prev_match?: string
 }
 
 export type HierarchyPagination<T> = {
diff --git a/src/web/routes/guild.js b/src/web/routes/guild.js
index a5508c4..dfb393b 100644
--- a/src/web/routes/guild.js
+++ b/src/web/routes/guild.js
@@ -115,7 +115,7 @@ function getChannelRoomsLinks(guild, rooms, roles) {
 	let removedWrongTypeChannels = dUtils.filterTo(unlinkedChannels, c => c && [0, 5].includes(c.type))
 	let removedPrivateChannels = dUtils.filterTo(unlinkedChannels, c => {
 		const permissions = dUtils.getPermissions(guild.id, roles, guild.roles, botID, c["permission_overwrites"])
-		return dUtils.hasSomePermissions(permissions, ["Administrator", "ViewChannel"])
+		return dUtils.hasPermission(permissions, DiscordTypes.PermissionFlagsBits.ViewChannel)
 	})
 	unlinkedChannels.sort((a, b) => getPosition(a, discord.channels) - getPosition(b, discord.channels))