diff --git a/common/fragments/minecraft.nix b/common/fragments/minecraft.nix
index e54d0c5..701f2d8 100644
--- a/common/fragments/minecraft.nix
+++ b/common/fragments/minecraft.nix
@@ -31,6 +31,7 @@ let
     white-list = true;
     spawn-protection = 0;
     allow-flight = true;
+    max-tick-time = 2 * 60 * 1000;
   };
 in {
   services.modded-minecraft-servers = {
@@ -42,6 +43,7 @@ in {
         enable = true;
         inherit rsyncSSHKeys jvmOpts;
 
+        jvmInitialAllocation = "2G";
         jvmMaxAllocation = "8G";
         jvmPackage = jre8;
 
diff --git a/common/home_manager/common.nix b/common/home_manager/common.nix
index d36a951..b17e29a 100644
--- a/common/home_manager/common.nix
+++ b/common/home_manager/common.nix
@@ -38,6 +38,8 @@
         extraConfig = {
           init = { defaultBranch = "mistress"; };
           core = { editor = "hx"; };
+          rebase.autosquash = true;
+          pull.rebase = true;
         };
       };