diff --git a/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java b/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java
index 5a947e3..e2d22e2 100644
--- a/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java
+++ b/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java
@@ -287,7 +287,7 @@ public class DiscordPlugin extends JavaPlugin implements IListener<ReadyEvent> {
 	}
 
 	public static void sendMessageToChannel(IChannel channel, String message, EmbedObject embed) {
-		sendMessageToChannel(channel, message, null, false);
+		sendMessageToChannel(channel, message, embed, false);
 	}
 
 	public static IMessage sendMessageToChannelWait(IChannel channel, String message) {
@@ -295,7 +295,7 @@ public class DiscordPlugin extends JavaPlugin implements IListener<ReadyEvent> {
 	}
 
 	public static IMessage sendMessageToChannelWait(IChannel channel, String message, EmbedObject embed) {
-		return sendMessageToChannel(channel, message, null, true);
+		return sendMessageToChannel(channel, message, embed, true);
 	}
 
 	private static IMessage sendMessageToChannel(IChannel channel, String message, EmbedObject embed, boolean wait) {
@@ -325,6 +325,10 @@ public class DiscordPlugin extends JavaPlugin implements IListener<ReadyEvent> {
 		}
 	}
 
+	public static EmbedBuilder embedWithHead(EmbedBuilder builder, String playername) {
+		return builder.withAuthorIcon("https://minotar.net/avatar/" + playername + "/32.png");
+	}
+
 	public static Permission perms;
 
 	public boolean setupProviders() {
diff --git a/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java b/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java
index 7fde389..52c9991 100644
--- a/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java
+++ b/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java
@@ -44,9 +44,11 @@ public class MCChatListener implements Listener, IListener<MessageReceivedEvent>
 				// embed.appendField("Channel", ((e.getSender() instanceof DiscordSenderBase ? "d|" : "")
 				// + DiscordPlugin.sanitizeString(e.getChannel().DisplayName)), false);
 				if (e.getSender() instanceof Player)
-					embed.withAuthorIcon("https://minotar.net/avatar/" + ((Player) e.getSender()).getName() + "/32.png")
-							.withAuthorUrl("https://tbmcplugins.github.io/profile.html?type=minecraft&id="
-									+ ((Player) e.getSender()).getUniqueId()); // TODO: Constant/method to get URLs like this
+					DiscordPlugin
+							.embedWithHead(
+									embed.withAuthorUrl("https://tbmcplugins.github.io/profile.html?type=minecraft&id="
+											+ ((Player) e.getSender()).getUniqueId()),
+									((Player) e.getSender()).getName());
 				else if (e.getSender() instanceof DiscordSenderBase)
 					embed.withAuthorIcon(((DiscordSenderBase) e.getSender()).getUser().getAvatarURL())
 							.withAuthorUrl("https://tbmcplugins.github.io/profile.html?type=discord&id="
@@ -331,8 +333,7 @@ public class MCChatListener implements Listener, IListener<MessageReceivedEvent>
 						try {
 							final IReaction reaction = m.getReactionByEmoji(DiscordPlugin.DELIVERED_REACTION);
 							if (reaction != null)
-								DiscordPlugin
-										.performNoWait(() -> m.removeReaction(DiscordPlugin.dc.getOurUser(), reaction));
+								DiscordPlugin.perform(() -> m.removeReaction(DiscordPlugin.dc.getOurUser(), reaction));
 						} catch (Exception e) {
 							TBMCCoreAPI.SendException("An error occured while removing reactions from chat!", e);
 						}