diff --git a/src/sharding/ShardClientUtil.js b/src/sharding/ShardClientUtil.js
index 1c47f0296..8b8262150 100644
--- a/src/sharding/ShardClientUtil.js
+++ b/src/sharding/ShardClientUtil.js
@@ -86,7 +86,7 @@ class ShardClientUtil {
    */
   broadcastEval(script) {
     return new Promise((resolve, reject) => {
-      script = typeof script !== 'function' ? `(${script})(this)` : script;
+      script = typeof script === 'function' ? `(${script})(this)` : script;
       const listener = message => {
         if (!message || message._sEval !== script) return;
         process.removeListener('message', listener);
diff --git a/src/structures/Guild.js b/src/structures/Guild.js
index 977e7b463..a75829313 100644
--- a/src/structures/Guild.js
+++ b/src/structures/Guild.js
@@ -40,7 +40,7 @@ class Guild extends Base {
 
     /**
      * A collection of roles that are in this guild. The key is the role's ID, the value is the role
-     * @type {Collection<Snowflake, Role>}
+     * @type {RoleStore<Snowflake, Role>}
      */
     this.roles = new RoleStore(this);
 
diff --git a/src/structures/MessageEmbed.js b/src/structures/MessageEmbed.js
index b7f430b75..9c8271372 100644
--- a/src/structures/MessageEmbed.js
+++ b/src/structures/MessageEmbed.js
@@ -67,8 +67,8 @@ class MessageEmbed {
     this.thumbnail = data.thumbnail ? {
       url: data.thumbnail.url,
       proxyURL: data.thumbnail.proxy_url,
-      height: data.height,
-      width: data.width,
+      height: data.thumbnail.height,
+      width: data.thumbnail.width,
     } : null;
 
     /**
@@ -82,8 +82,8 @@ class MessageEmbed {
     this.image = data.image ? {
       url: data.image.url,
       proxyURL: data.image.proxy_url,
-      height: data.height,
-      width: data.width,
+      height: data.image.height,
+      width: data.image.width,
     } : null;
 
     /**