diff --git a/l2jserver2-gameserver/pom.xml b/l2jserver2-gameserver/pom.xml
index 366204fa0..2112b0020 100644
--- a/l2jserver2-gameserver/pom.xml
+++ b/l2jserver2-gameserver/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>com.l2jserver</groupId>
diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/Lineage2Client.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/Lineage2Client.java
index f6e7dad8a..4c9f8eb97 100644
--- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/Lineage2Client.java
+++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/Lineage2Client.java
@@ -150,7 +150,7 @@ public class Lineage2Client {
 	public boolean supports(ProtocolVersion version) {
 		if (version == null)
 			return false;
-		return version.supports(version);
+		return this.version.supports(version);
 	}
 
 	/**
@@ -405,4 +405,10 @@ public class Lineage2Client {
 		return (Lineage2PacketWriter) channel.getPipeline().get(
 				Lineage2PacketWriter.HANDLER_NAME);
 	}
+	@Override
+	public String toString() {
+		return "Lineage2Client [channel=" + channel + ", characterID="
+				+ characterID + ", session=" + session + ", version=" + version
+				+ "]";
+	}
 }
diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/Lineage2Session.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/Lineage2Session.java
index 56b0745a2..625104ab1 100644
--- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/Lineage2Session.java
+++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/Lineage2Session.java
@@ -104,4 +104,11 @@ public class Lineage2Session {
 	public int getLoginKey2() {
 		return loginKey2;
 	}
+
+	@Override
+	public String toString() {
+		return "Lineage2Session [accountID=" + accountID + ", playKey1="
+				+ playKey1 + ", playKey2=" + playKey2 + ", loginKey1="
+				+ loginKey1 + ", loginKey2=" + loginKey2 + "]";
+	}
 }
diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_BYPASS.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_BYPASS.java
index 1b62326e2..69a7caf1a 100644
--- a/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_BYPASS.java
+++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/game/net/packet/client/CM_BYPASS.java
@@ -87,7 +87,8 @@ public class CM_BYPASS extends AbstractClientPacket {
 		// parse command
 		final StringTokenizer tokenizer = new StringTokenizer(command, "_ ");
 		final String type = tokenizer.nextToken();
-		if (type.equals("npc")) {
+		switch (type) {
+		case "npc":
 			final int objectId = Integer.parseInt(tokenizer.nextToken());
 			final ObjectID<NPC> id = idResolver.resolve(objectId);
 			if (!(id instanceof NPCID)) {
@@ -107,8 +108,12 @@ public class CM_BYPASS extends AbstractClientPacket {
 					conn.sendSystemMessage(e.getSystemMessage());
 				conn.sendActionFailed();
 			}
-		} else {
-			log.warn("Client requested an bypass not supported by server");
+			return;
+		default:
+			log.warn(
+					"Client {} requested an bypass not supported by server: {}",
+					conn, type);
+			return;
 		}
 	}
 
diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/BaseNPCController.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/BaseNPCController.java
index 629ffd4b6..b5d4dc087 100644
--- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/BaseNPCController.java
+++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/BaseNPCController.java
@@ -77,10 +77,12 @@ public abstract class BaseNPCController implements NPCController {
 	public void interact(NPC npc, L2Character character, final String... args)
 			throws L2Exception {
 		if (args.length == 2) {
-			if (args[0].equals("Chat")) {
+			switch(args[0]) {
+			case "Chat":
 				if (talk(npc, character,
 						Arrays.copyOfRange(args, 1, args.length)))
 					return;
+				break;
 			}
 		} else if (args.length == 0 || args.length == 1) {
 			// default action is talk
diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/controller/impl/TeleporterController.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/controller/impl/TeleporterController.java
index 27d023271..ad2f9b0c9 100644
--- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/controller/impl/TeleporterController.java
+++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/controller/impl/TeleporterController.java
@@ -46,7 +46,8 @@ public class TeleporterController extends BaseNPCController {
 	public void interact(NPC npc, L2Character character, String... args)
 			throws L2Exception {
 		if (args.length >= 2) {
-			if (args[0].equals("goto")) {
+			switch (args[0]) {
+			case "goto":
 				final TeleportationTemplate tele = teleportationIdProvider
 						.resolveID(Integer.parseInt(args[1])).getTemplate();
 				if (tele == null) {
diff --git a/pom.xml b/pom.xml
index 6c15d6a94..4ac614f12 100644
--- a/pom.xml
+++ b/pom.xml
@@ -87,7 +87,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-release-plugin</artifactId>
-				<version>2.0</version>
+				<version>2.2.2</version>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
diff --git a/src/assembly/bin.xml b/src/assembly/bin.xml
deleted file mode 100644
index 03221daaa..000000000
--- a/src/assembly/bin.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<assembly
-	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-	<id>bin</id>
-	<formats>
-		<format>zip</format>
-	</formats>
-	<baseDirectory>${basedir}</baseDirectory>
-	<files>
-		<file>
-			<source>${basedir}/l2jserver2-gameserver/target/l2jserver2-gameserver-${project.version}-mysql5-bin.zip</source>
-			<outputDirectory>/</outputDirectory>
-		</file>
-	</files>
-</assembly>
\ No newline at end of file