diff --git a/src/main/java/org/parabot/core/Context.java b/src/main/java/org/parabot/core/Context.java
index 943d051..e709ff9 100644
--- a/src/main/java/org/parabot/core/Context.java
+++ b/src/main/java/org/parabot/core/Context.java
@@ -185,9 +185,13 @@ public class Context {
         panel.add(gameApplet);
         panel.validate();
 
+        serverProvider.preAppletInit();
+
         gameApplet.init();
         gameApplet.start();
 
+        serverProvider.postAppletStart();
+
         java.util.Timer t = new java.util.Timer();
         t.schedule(new TimerTask() {
             @Override
diff --git a/src/main/java/org/parabot/core/desc/ServerDescription.java b/src/main/java/org/parabot/core/desc/ServerDescription.java
index 687410c..f908842 100644
--- a/src/main/java/org/parabot/core/desc/ServerDescription.java
+++ b/src/main/java/org/parabot/core/desc/ServerDescription.java
@@ -37,6 +37,9 @@ public class ServerDescription implements Comparable<ServerDescription> {
 
     @Override
     public int compareTo(ServerDescription o) {
+        if (this.getServerName().equalsIgnoreCase(o.getServerName())) {
+            return 1;
+        }
         return this.getServerName().compareTo(o.getServerName());
     }
 
diff --git a/src/main/java/org/parabot/environment/servers/ServerProvider.java b/src/main/java/org/parabot/environment/servers/ServerProvider.java
index da9b465..6765781 100644
--- a/src/main/java/org/parabot/environment/servers/ServerProvider.java
+++ b/src/main/java/org/parabot/environment/servers/ServerProvider.java
@@ -146,4 +146,20 @@ public abstract class ServerProvider implements Opcodes {
 
     }
 
+    /**
+     * Called in Context.setApplet before applet.init() is called. Exclusively used for manipulating the Frame attached
+     * to the applet of Roatpkz.
+     */
+    public void preAppletInit() {
+
+    }
+
+    /**
+     * Called in Context.setApplet before after applet.start()  and applet.init() are called. Exclusively used for manipulating the Frame attached
+     * to the applet of Roatpkz.
+     */
+    public void postAppletStart() {
+
+    }
+
 }