diff --git a/src/d2m/actions/create-room.js b/src/d2m/actions/create-room.js
index f913718..acd47d4 100644
--- a/src/d2m/actions/create-room.js
+++ b/src/d2m/actions/create-room.js
@@ -487,9 +487,8 @@ async function unbridgeDeletedChannel(channel, guildID) {
 	/** @type {Ty.Event.M_Power_Levels} */
 	const powerLevelContent = await api.getStateEvent(roomID, "m.room.power_levels", "")
 	powerLevelContent.users ??= {}
-	const bot = `@${reg.sender_localpart}:${reg.ooye.server_name}`
 	for (const mxid of Object.keys(powerLevelContent.users)) {
-		if (powerLevelContent.users[mxid] >= 100 && mUtils.eventSenderIsFromDiscord(mxid) && mxid !== bot) {
+		if (powerLevelContent.users[mxid] >= 100 && mUtils.eventSenderIsFromDiscord(mxid) && mxid !== mUtils.bot) {
 			delete powerLevelContent.users[mxid]
 			await api.sendState(roomID, "m.room.power_levels", "", powerLevelContent, mxid)
 		}
@@ -513,7 +512,7 @@ async function unbridgeDeletedChannel(channel, guildID) {
 	// (the room can be used with less clutter and the member list makes sense if it's bridged somewhere else)
 	if (row.autocreate === 0) {
 		// remove sim members
-		const members = db.prepare("SELECT mxid FROM sim_member WHERE room_id = ? AND mxid <> ?").pluck().all(roomID, bot)
+		const members = db.prepare("SELECT mxid FROM sim_member WHERE room_id = ? AND mxid <> ?").pluck().all(roomID, mUtils.bot)
 		const preparedDelete = db.prepare("DELETE FROM sim_member WHERE room_id = ? AND mxid = ?")
 		for (const mxid of members) {
 			await api.leaveRoom(roomID, mxid)
diff --git a/src/m2d/event-dispatcher.js b/src/m2d/event-dispatcher.js
index 75dad4d..e86dac5 100644
--- a/src/m2d/event-dispatcher.js
+++ b/src/m2d/event-dispatcher.js
@@ -173,7 +173,7 @@ async function onRetryReactionAdd(reactionEvent) {
 		if (event.sender !== `@${reg.sender_localpart}:${reg.ooye.server_name}` || !error) return
 
 		// To stop people injecting misleading messages, the reaction needs to come from either the original sender or a room moderator
-		if (reactionEvent.sender !== event.sender) {
+		if (reactionEvent.sender !== error.payload.sender) {
 			// Check if it's a room moderator
 			const {powers: {[reactionEvent.sender]: senderPower}, powerLevels} = await utils.getEffectivePower(roomID, [reactionEvent.sender], api)
 			if (senderPower < (powerLevels.state_default ?? 50)) return
diff --git a/src/matrix/api.js b/src/matrix/api.js
index 8451857..b71c068 100644
--- a/src/matrix/api.js
+++ b/src/matrix/api.js
@@ -162,7 +162,7 @@ function getStateEventOuter(roomID, type, key) {
  */
 async function getInviteState(roomID) {
 	/** @type {Ty.R.SSS} */
-	const root = await mreq.mreq("POST", path("/client/unstable/org.matrix.simplified_msc3575/sync", `@${reg.sender_localpart}:${reg.ooye.server_name}`), {
+	const root = await mreq.mreq("POST", path("/client/unstable/org.matrix.simplified_msc3575/sync", `@${reg.sender_localpart}:${reg.ooye.server_name}`, {timeout: "0"}), {
 		room_subscriptions: {
 			[roomID]: {
 				timeline_limit: 0,