diff --git a/commands/general/info.js b/commands/general/info.js
index d16137e..1b60fc4 100644
--- a/commands/general/info.js
+++ b/commands/general/info.js
@@ -1,17 +1,12 @@
 import { readFileSync } from "fs";
-import { dirname } from "path";
-import { fileURLToPath } from "url";
 const { version } = JSON.parse(readFileSync(new URL("../../package.json", import.meta.url)));
 import Command from "../../classes/command.js";
-import { exec as baseExec } from "child_process";
-import { promisify } from "util";
 import { getServers } from "../../utils/misc.js";
-const exec = promisify(baseExec);
 
 class InfoCommand extends Command {
   async run() {
     const owner = await this.client.getRESTUser(process.env.OWNER.split(",")[0]);
-    const servers = await getServers();
+    const servers = await getServers(this.client);
     await this.acknowledge();
     return {
       embeds: [{
@@ -23,7 +18,7 @@ class InfoCommand extends Command {
         description: `This instance is managed by **${owner.username}#${owner.discriminator}**.`,
         fields: [{
           name: "ℹ️ Version:",
-          value: `v${version}${process.env.NODE_ENV === "development" ? `-dev (${(await exec("git rev-parse HEAD", { cwd: dirname(fileURLToPath(import.meta.url)) })).stdout.substring(0, 7)})` : ""}`
+          value: `v${version}${process.env.NODE_ENV === "development" ? `-dev (${process.env.GIT_REV})` : ""}`
         },
         {
           name: "📝 Credits:",
diff --git a/commands/general/stats.js b/commands/general/stats.js
index 4b4161c..1752abd 100644
--- a/commands/general/stats.js
+++ b/commands/general/stats.js
@@ -1,22 +1,18 @@
 import { readFileSync } from "fs";
-import { dirname } from "path";
-import { fileURLToPath } from "url";
 const { version } = JSON.parse(readFileSync(new URL("../../package.json", import.meta.url)));
 import os from "os";
 import Command from "../../classes/command.js";
 import { VERSION } from "eris";
-import { exec as baseExec } from "child_process";
-import { promisify } from "util";
 import pm2 from "pm2";
 import { getServers } from "../../utils/misc.js";
-const exec = promisify(baseExec);
 
 class StatsCommand extends Command {
   async run() {
     const uptime = process.uptime() * 1000;
     const connUptime = this.client.uptime;
     const owner = await this.client.getRESTUser(process.env.OWNER.split(",")[0]);
-    const servers = await getServers();
+    const servers = await getServers(this.client);
+    const processMem = `${(process.memoryUsage().heapUsed / 1024 / 1024).toFixed(2)} MB`;
     return {
       embeds: [{
         "author": {
@@ -27,16 +23,16 @@ class StatsCommand extends Command {
         "color": 16711680,
         "fields": [{
           "name": "Version",
-          "value": `v${version}${process.env.NODE_ENV === "development" ? `-dev (${(await exec("git rev-parse HEAD", { cwd: dirname(fileURLToPath(import.meta.url)) })).stdout.substring(0, 7)})` : ""}`
+          "value": `v${version}${process.env.NODE_ENV === "development" ? `-dev (${process.env.GIT_REV})` : ""}`
         },
         {
           "name": "Process Memory Usage",
-          "value": `${(process.memoryUsage().heapUsed / 1024 / 1024).toFixed(2)} MB`,
+          "value": processMem,
           "inline": true
         },
         {
           "name": "Total Memory Usage",
-          "value": process.env.PM2_USAGE ? `${((await this.list()).reduce((prev, cur) => prev + cur.monit.memory, 0) / 1024 / 1024).toFixed(2)} MB` : "Unknown",
+          "value": process.env.PM2_USAGE ? `${((await this.list()).reduce((prev, cur) => prev + cur.monit.memory, 0) / 1024 / 1024).toFixed(2)} MB` : processMem,
           "inline": true
         },
         {
diff --git a/utils/misc.js b/utils/misc.js
index 8b9f697..4bac238 100644
--- a/utils/misc.js
+++ b/utils/misc.js
@@ -81,7 +81,7 @@ export function endBroadcast(bot) {
   broadcast = false;
 }
 
-export function getServers() {
+export function getServers(bot) {
   return new Promise((resolve, reject) => {
     if (process.env.PM2_USAGE) {
       pm2.launchBus((err, pm2Bus) => {
@@ -104,7 +104,7 @@ export function getServers() {
         if (err) reject(err);
       });
     } else {
-      resolve(0);
+      resolve(bot.guilds.size);
     }
   });
 }
\ No newline at end of file