diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/metrics/CpuUsageGauge.java b/service/src/main/java/org/whispersystems/textsecuregcm/metrics/CpuUsageGauge.java
index d9ebe97ce..df40e80ce 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/metrics/CpuUsageGauge.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/metrics/CpuUsageGauge.java
@@ -24,6 +24,6 @@ public class CpuUsageGauge extends CachedGauge<Integer> {
 
   @Override
   protected Integer loadValue() {
-    return (int) Math.ceil(operatingSystemMXBean.getSystemCpuLoad() * 100);
+    return (int) Math.ceil(operatingSystemMXBean.getCpuLoad() * 100);
   }
 }
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/metrics/FreeMemoryGauge.java b/service/src/main/java/org/whispersystems/textsecuregcm/metrics/FreeMemoryGauge.java
index 8463bbb33..a04330b36 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/metrics/FreeMemoryGauge.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/metrics/FreeMemoryGauge.java
@@ -7,7 +7,6 @@ package org.whispersystems.textsecuregcm.metrics;
 
 import com.codahale.metrics.Gauge;
 import com.sun.management.OperatingSystemMXBean;
-
 import java.lang.management.ManagementFactory;
 
 public class FreeMemoryGauge implements Gauge<Long> {
@@ -21,6 +20,6 @@ public class FreeMemoryGauge implements Gauge<Long> {
 
   @Override
   public Long getValue() {
-    return operatingSystemMXBean.getFreePhysicalMemorySize();
+    return operatingSystemMXBean.getFreeMemorySize();
   }
 }
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnection.java b/service/src/main/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnection.java
index c838025f0..478442796 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnection.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnection.java
@@ -289,7 +289,7 @@ public class WebSocketConnection implements MessageAvailabilityListener, Displac
       for (int i = 0; i < messages.getMessages().size(); i++) {
         final OutgoingMessageEntity message = messages.getMessages().get(i);
         final Envelope.Builder builder = Envelope.newBuilder()
-            .setType(Envelope.Type.valueOf(message.getType()))
+            .setType(Envelope.Type.forNumber(message.getType()))
             .setTimestamp(message.getTimestamp())
             .setServerTimestamp(message.getServerTimestamp());