diff --git a/NCPCompatBukkit/src/main/java/fr/neatmonster/nocheatplus/compat/bukkit/MCAccessBukkit.java b/NCPCompatBukkit/src/main/java/fr/neatmonster/nocheatplus/compat/bukkit/MCAccessBukkit.java
index 4a850112..b852ed09 100644
--- a/NCPCompatBukkit/src/main/java/fr/neatmonster/nocheatplus/compat/bukkit/MCAccessBukkit.java
+++ b/NCPCompatBukkit/src/main/java/fr/neatmonster/nocheatplus/compat/bukkit/MCAccessBukkit.java
@@ -79,13 +79,14 @@ public class MCAccessBukkit implements MCAccess, BlockPropertiesSetup{
 		final Material mat = Material.getMaterial(id); 
 		if (mat == null) return AlmostBoolean.MAYBE;
 		switch (mat) {
-		case STATIONARY_LAVA:
-		case STATIONARY_WATER:
-		case WATER:
-		case LAVA:
-			return AlmostBoolean.YES;
+			case STATIONARY_LAVA:
+			case STATIONARY_WATER:
+			case WATER:
+			case LAVA:
+				return AlmostBoolean.YES;
+			default:
+				return AlmostBoolean.NO;
 		}
-		return AlmostBoolean.NO;
 	}
 
 	@Override
diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/combined/CombinedConfig.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/combined/CombinedConfig.java
index f8e14b54..3ac7dc29 100644
--- a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/combined/CombinedConfig.java
+++ b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/combined/CombinedConfig.java
@@ -141,14 +141,15 @@ public class CombinedConfig extends ACheckConfig {
 	@Override
 	public boolean isEnabled(final CheckType checkType) {
 		switch(checkType){
-		case COMBINED_IMPROBABLE:
-			return improbableCheck;
-		case COMBINED_BEDLEAVE:
-			return bedLeaveCheck;
-		case COMBINED_MUNCHHAUSEN:
-			return munchHausenCheck;
+			case COMBINED_IMPROBABLE:
+				return improbableCheck;
+			case COMBINED_BEDLEAVE:
+				return bedLeaveCheck;
+			case COMBINED_MUNCHHAUSEN:
+				return munchHausenCheck;
+			default:
+				return false;
 		}
-		return false;
 	}
 
 	public static void clear() {
diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/hooks/NCPExemptionManager.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/hooks/NCPExemptionManager.java
index ace6aed7..8a5fbd72 100644
--- a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/hooks/NCPExemptionManager.java
+++ b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/hooks/NCPExemptionManager.java
@@ -125,19 +125,16 @@ public class NCPExemptionManager {
 	 */
 	public static Listener getListener() {
 		return new NCPListener() {
-			@SuppressWarnings("unused")
 			@EventHandler(priority = EventPriority.LOWEST)
 			public void onPlayerJoin(final PlayerJoinEvent event) {
 				NCPExemptionManager.registerPlayer(event.getPlayer());
 			}
 
-			@SuppressWarnings("unused")
 			@EventHandler(priority = EventPriority.MONITOR)
 			public void onPlayerQuit(final PlayerQuitEvent event) {
 				NCPExemptionManager.tryToRemove(event.getPlayer());
 			}
 
-			@SuppressWarnings("unused")
 			@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
 			public void onPlayerKick(final PlayerKickEvent event) {
 				NCPExemptionManager.tryToRemove(event.getPlayer());
diff --git a/NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/NoCheatPlus.java b/NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/NoCheatPlus.java
index e18fb0de..35a58ab0 100644
--- a/NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/NoCheatPlus.java
+++ b/NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/NoCheatPlus.java
@@ -948,7 +948,6 @@ public class NoCheatPlus extends JavaPlugin implements NoCheatPlusAPI {
 	 */
 	private Listener getCoreListener() {
 		return new NCPListener() {
-			@SuppressWarnings("unused")
 			@EventHandler(priority = EventPriority.NORMAL)
 			public void onPlayerLogin(final PlayerLoginEvent event) {
 				// (NORMAL to have chat checks come after this.)
@@ -965,13 +964,11 @@ public class NoCheatPlus extends JavaPlugin implements NoCheatPlusAPI {
 				}
 			}
 
-			@SuppressWarnings("unused")
 			@EventHandler(priority = EventPriority.MONITOR)
 			public void onPlayerJoin(final PlayerJoinEvent event) {
 				onJoin(event.getPlayer());
 			}
 
-			@SuppressWarnings("unused")
 			@EventHandler(priority = EventPriority.MONITOR)
 			public void onPlayerchangedWorld(final PlayerChangedWorldEvent event)
 			{
@@ -979,13 +976,11 @@ public class NoCheatPlus extends JavaPlugin implements NoCheatPlusAPI {
 				updatePermStateReceivers(player);
 			}
 
-			@SuppressWarnings("unused")
 			@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
 			public void onPlayerKick(final PlayerKickEvent event) {
 				onLeave(event.getPlayer());
 			}
 
-			@SuppressWarnings("unused")
 			@EventHandler(priority = EventPriority.MONITOR)
 			public void onPlayerQuitMonitor(final PlayerQuitEvent event) {
 				onLeave(event.getPlayer());