diff --git a/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java b/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java
index 7a76bcf..557ecd4 100755
--- a/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java
+++ b/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java
@@ -156,7 +156,7 @@ public class DiscordPlugin extends ButtonPlugin implements IListener<ReadyEvent>
                         val chconkeys = chcons.getKeys(false);
                         for (val chconkey : chconkeys) {
                             val chcon = chcons.getConfigurationSection(chconkey);
-                            val mcch = Channel.getChannels().stream().filter(ch -> ch.ID.equals(chcon.getString("mcchid"))).findAny();
+	                        val mcch = Channel.getChannels().filter(ch -> ch.ID.equals(chcon.getString("mcchid"))).findAny();
                             val ch = dc.getChannelByID(chcon.getLong("chid"));
                             val did = chcon.getLong("did");
                             val user = dc.fetchUser(did);
diff --git a/src/main/java/buttondevteam/discordplugin/commands/ChannelconCommand.java b/src/main/java/buttondevteam/discordplugin/commands/ChannelconCommand.java
index c2a84d3..8d20eb9 100644
--- a/src/main/java/buttondevteam/discordplugin/commands/ChannelconCommand.java
+++ b/src/main/java/buttondevteam/discordplugin/commands/ChannelconCommand.java
@@ -64,7 +64,7 @@ public class ChannelconCommand extends DiscordCommandBase {
             message.reply("this channel is already connected to a Minecraft channel. Use `@ChromaBot channelcon remove` to remove it.");
             return true;
         }
-	    val chan = Channel.getChannels().stream().filter(ch -> ch.ID.equalsIgnoreCase(args) || (Arrays.stream(ch.IDs().get()).anyMatch(cid -> cid.equalsIgnoreCase(args)))).findAny();
+	    val chan = Channel.getChannels().filter(ch -> ch.ID.equalsIgnoreCase(args) || (Arrays.stream(ch.IDs().get()).anyMatch(cid -> cid.equalsIgnoreCase(args)))).findAny();
         if (!chan.isPresent()) { //TODO: Red embed that disappears over time (kinda like the highlight messages in OW)
             message.reply("MC channel with ID '" + args + "' not found! The ID is the command for it without the /.");
             return true;
diff --git a/src/main/java/buttondevteam/discordplugin/mcchat/MCChatListener.java b/src/main/java/buttondevteam/discordplugin/mcchat/MCChatListener.java
index c7df658..8542eee 100755
--- a/src/main/java/buttondevteam/discordplugin/mcchat/MCChatListener.java
+++ b/src/main/java/buttondevteam/discordplugin/mcchat/MCChatListener.java
@@ -331,7 +331,7 @@ public class MCChatListener implements Listener {
                 } else {
                     int spi = cmdlowercased.indexOf(' ');
                     final String topcmd = spi == -1 ? cmdlowercased : cmdlowercased.substring(0, spi);
-                    Optional<Channel> ch = Channel.getChannels().stream()
+	                Optional<Channel> ch = Channel.getChannels()
                             .filter(c -> c.ID.equalsIgnoreCase(topcmd)
 	                            || (c.IDs().get().length > 0
 	                            && Arrays.stream(c.IDs().get()).anyMatch(id -> id.equalsIgnoreCase(topcmd)))).findAny();
diff --git a/src/main/java/buttondevteam/discordplugin/mcchat/MCChatPrivate.java b/src/main/java/buttondevteam/discordplugin/mcchat/MCChatPrivate.java
index 99c1740..877d415 100644
--- a/src/main/java/buttondevteam/discordplugin/mcchat/MCChatPrivate.java
+++ b/src/main/java/buttondevteam/discordplugin/mcchat/MCChatPrivate.java
@@ -59,7 +59,8 @@ public class MCChatPrivate {
 	public static void logoutAll() {
 		for (val entry : MCChatUtils.ConnectedSenders.entrySet())
 			for (val valueEntry : entry.getValue().entrySet())
-				callEventExcludingSome(new PlayerQuitEvent(valueEntry.getValue(), "")); //This is sync
+				if (MCChatUtils.getSender(MCChatUtils.OnlineSenders, valueEntry.getKey(), valueEntry.getValue().getUser()) == null) //If the player is online then the fake player was already logged out
+					callEventExcludingSome(new PlayerQuitEvent(valueEntry.getValue(), "")); //This is sync
 		MCChatUtils.ConnectedSenders.clear();
 	}