diff --git a/src/client/voice/dispatcher/StreamDispatcher.js b/src/client/voice/dispatcher/StreamDispatcher.js
index 2923eb61e..20a63fd9f 100644
--- a/src/client/voice/dispatcher/StreamDispatcher.js
+++ b/src/client/voice/dispatcher/StreamDispatcher.js
@@ -73,10 +73,10 @@ class StreamDispatcher extends Writable {
       this._setSpeaking(0);
     });
 
-    if (typeof volume !== 'undefined') this.setVolume(volume);
+    this.setVolume(volume);
+    this.setBitrate(bitrate);
     if (typeof fec !== 'undefined') this.setFEC(fec);
     if (typeof plp !== 'undefined') this.setPLP(plp);
-    if (typeof bitrate !== 'undefined') this.setBitrate(bitrate);
 
     const streamError = (type, err) => {
       /**
diff --git a/src/client/websocket/WebSocketManager.js b/src/client/websocket/WebSocketManager.js
index becc570c8..1c22a5bfe 100644
--- a/src/client/websocket/WebSocketManager.js
+++ b/src/client/websocket/WebSocketManager.js
@@ -158,7 +158,7 @@ class WebSocketManager extends EventEmitter {
     if (shards === 'auto') {
       this.debug(`Using the recommended shard count provided by Discord: ${recommendedShards}`);
       this.totalShards = this.client.options.shardCount = recommendedShards;
-      if (shards === 'auto' || !this.client.options.shards.length) {
+      if (!this.client.options.shards.length) {
         this.client.options.shards = Array.from({ length: recommendedShards }, (_, i) => i);
       }
     }
diff --git a/src/client/websocket/handlers/CHANNEL_PINS_UPDATE.js b/src/client/websocket/handlers/CHANNEL_PINS_UPDATE.js
index da73693cb..6da643ff3 100644
--- a/src/client/websocket/handlers/CHANNEL_PINS_UPDATE.js
+++ b/src/client/websocket/handlers/CHANNEL_PINS_UPDATE.js
@@ -6,7 +6,7 @@ module.exports = (client, { d: data }) => {
   const channel = client.channels.get(data.channel_id);
   const time = new Date(data.last_pin_timestamp);
 
-  if (channel && time) {
+  if (channel && !Number.isNaN(time.getTime())) {
     // Discord sends null for last_pin_timestamp if the last pinned message was removed
     channel.lastPinTimestamp = time.getTime() || null;
 
diff --git a/src/structures/Guild.js b/src/structures/Guild.js
index 3dd518d40..5827ff49b 100644
--- a/src/structures/Guild.js
+++ b/src/structures/Guild.js
@@ -775,6 +775,7 @@ class Guild extends Base {
         }
         roles.push(role.id);
       }
+      options.roles = roles;
     }
     return this.client.api.guilds(this.id).members(user).put({ data: options })
       .then(data => this.members.add(data));
diff --git a/src/structures/MessageCollector.js b/src/structures/MessageCollector.js
index f357722b5..f8f3d5ab8 100644
--- a/src/structures/MessageCollector.js
+++ b/src/structures/MessageCollector.js
@@ -36,9 +36,9 @@ class MessageCollector extends Collector {
      */
     this.received = 0;
 
-    const bulkDeleteListener = (messages => {
+    const bulkDeleteListener = messages => {
       for (const message of messages.values()) this.handleDispose(message);
-    }).bind(this);
+    };
     this._handleChannelDeletion = this._handleChannelDeletion.bind(this);
     this._handleGuildDeletion = this._handleGuildDeletion.bind(this);