diff --git a/src/com/dre/brewery/BPlayer.java b/src/com/dre/brewery/BPlayer.java
index 36dd99a..7566b63 100644
--- a/src/com/dre/brewery/BPlayer.java
+++ b/src/com/dre/brewery/BPlayer.java
@@ -493,13 +493,11 @@ public class BPlayer {
 			}
 
 		} else if (offlineDrunk - drunkeness >= 30) {
-			if (BConfig.enableWake) {
+			if (BConfig.enableWake && !player.hasPermission("brewery.bypass.teleport")) {
 				Location randomLoc = Wakeup.getRandom(player.getLocation());
 				if (randomLoc != null) {
-					if (!player.hasPermission("brewery.bypass.teleport")) {
-						player.teleport(randomLoc);
-						P.p.msg(player, P.p.languageReader.get("Player_Wake"));
-					}
+					player.teleport(randomLoc);
+					P.p.msg(player, P.p.languageReader.get("Player_Wake"));
 				}
 			}
 			offlineDrunk = 0;
diff --git a/src/com/dre/brewery/P.java b/src/com/dre/brewery/P.java
index ad0c869..ca32da2 100644
--- a/src/com/dre/brewery/P.java
+++ b/src/com/dre/brewery/P.java
@@ -341,7 +341,7 @@ public class P extends JavaPlugin {
 			}));
 
 			metrics.addCustomChart(new SimplePie("wakeups", () -> {
-				if (!BConfig.enableHome) {
+				if (!BConfig.enableWake) {
 					return "disabled";
 				}
 				int wakeups = Wakeup.wakeups.size();
diff --git a/src/com/dre/brewery/Wakeup.java b/src/com/dre/brewery/Wakeup.java
index 069c80a..8f9a5b3 100644
--- a/src/com/dre/brewery/Wakeup.java
+++ b/src/com/dre/brewery/Wakeup.java
@@ -32,7 +32,7 @@ public class Wakeup {
 			return null;
 		}
 
-		List worldWakes = wakeups.stream()
+		List<Wakeup> worldWakes = wakeups.stream()
 			.filter(w -> w.active)
 			.filter(w -> w.loc.getWorld().equals(playerLoc.getWorld()))
 			.collect(Collectors.toList());