diff --git a/commands/message/info/avatar.js b/commands/message/info/avatar.js
index 4689a38..1179f3f 100644
--- a/commands/message/info/avatar.js
+++ b/commands/message/info/avatar.js
@@ -1,6 +1,6 @@
 const { createEmbed, page } = require("../../../labscore/utils/embed");
 const { editOrReply } = require("../../../labscore/utils/message");
-const { getMember } = require("../../../labscore/utils/users");
+const { getMember, getUser } = require("../../../labscore/utils/users");
 
 const { paginator } = require('../../../labscore/client');
 
@@ -18,14 +18,14 @@ module.exports = {
   run: async (context, args) => {
     context.triggerTyping();
     if(!args.user) args.user = context.userId;
-    let u = await getMember(context, args.user)
+    let u = await getUser(context, args.user)
     if(!u) return editOrReply(context, { embeds: [createEmbed("warning", context, "No users found.")] })
 
-    if(u.avatar !== null) {
+    if(u.member && u.member.avatar !== null) {
       let pages = []
       pages.push(page(createEmbed("default", context, {
         image: {
-          url: u.avatarUrl + '?size=4096'
+          url: u.member.avatarUrl + '?size=4096'
         }
       })))
 
diff --git a/labscore/utils/buttons.js b/labscore/utils/buttons.js
index 0b25bc1..90519ed 100644
--- a/labscore/utils/buttons.js
+++ b/labscore/utils/buttons.js
@@ -1,5 +1,5 @@
 const MUSIC_PLATFORMS = {
-  "amazon": "914614653479428177",
+  "amazonStore": "914614653479428177",
   "amazonMusic": "914624582302982194",
   "deezer": "914614652644761650",
   "appleMusic": "914615427009744927",