diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index a616fc2e8d..c093c76ab3 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -34,7 +34,9 @@
                 <data android:mimeType="application/octet-stream"/>
             </intent-filter>
 
-            <intent-filter>
+            <intent-filter android:icon="@mipmap/ic_launcher"
+                           android:label="Mindustry Map"
+                           android:priority="1">
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <data android:scheme="file"   android:host="*" android:pathPattern=".*\\.mmap"  android:mimeType="*/*"  />
diff --git a/build.gradle b/build.gradle
index 95c4e6dc6d..70bb2b1d3d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -27,7 +27,7 @@ allprojects {
         gdxVersion = '1.9.8'
         roboVMVersion = '2.3.0'
         aiVersion = '1.8.1'
-        uCoreVersion = 'a077c3a'
+        uCoreVersion = '5a10c7f'
 
         getVersionString = {
             String buildVersion = getBuildVersion()
diff --git a/server/src/io/anuke/mindustry/server/ServerControl.java b/server/src/io/anuke/mindustry/server/ServerControl.java
index 5c81a29323..b846df3281 100644
--- a/server/src/io/anuke/mindustry/server/ServerControl.java
+++ b/server/src/io/anuke/mindustry/server/ServerControl.java
@@ -251,11 +251,9 @@ public class ServerControl extends Module {
         handler.register("friendlyfire", "<on/off>", "Enable or disable friendly fire.", arg -> {
             String s = arg[0];
             if(s.equalsIgnoreCase("on")){
-                NetEvents.handleFriendlyFireChange(true);
                 state.friendlyFire = true;
                 info("Friendly fire enabled.");
             }else if(s.equalsIgnoreCase("off")){
-                NetEvents.handleFriendlyFireChange(false);
                 state.friendlyFire = false;
                 info("Friendly fire disabled.");
             }else{
@@ -447,7 +445,6 @@ public class ServerControl extends Module {
 
             if(target != null){
                 netServer.admins.adminPlayer(target.uuid, Net.getConnection(target.clientid).address);
-                NetEvents.handleAdminSet(target, true);
                 info("Admin-ed player by ID: {0} / {1}", target.uuid, arg[0]);
             }else{
                 info("Nobody with that name could be found.");
@@ -471,7 +468,6 @@ public class ServerControl extends Module {
 
             if(target != null){
                 netServer.admins.unAdminPlayer(target.uuid);
-                NetEvents.handleAdminSet(target, false);
                 info("Un-admin-ed player by ID: {0} / {1}", target.uuid, arg[0]);
             }else{
                 info("Nobody with that name could be found.");