diff --git a/configuration.nix b/configuration.nix
index 5d0c836..c59a990 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -124,7 +124,7 @@
     let
       no-rgb = pkgs.writeScriptBin "no-rgb" ''
         #!/bin/sh
-        NUM_DEVICES=$(${pkgs.openrgb}/bin/openrgb --noautoconnect --list-devices | ${pkgs.coreutils}/bin/grep -E '^[0-9]+: ' | ${pkgs.coreutils}/bin/wc -l)
+        NUM_DEVICES=$(${pkgs.openrgb}/bin/openrgb --noautoconnect --list-devices | ${pkgs.gnugrep}/bin/grep -E '^[0-9]+: ' | ${pkgs.coreutils}/bin/wc -l)
 
         for i in $(${pkgs.coreutils}/bin/seq 0 $(($NUM_DEVICES - 1))); do
           ${pkgs.openrgb}/bin/openrgb --noautoconnect --device $i --mode direct --color 000000
diff --git a/services/gitea.nix b/services/gitea.nix
index 0d20746..39f3a0a 100644
--- a/services/gitea.nix
+++ b/services/gitea.nix
@@ -6,7 +6,7 @@
 {
   services.gitea = {
     enable = true;
-    appName = "TBD name of my gitea server";
+    appName = "Simon Gardling's Gitea instance";
     stateDir = service_configs.gitea.dir;
     database = {
       type = "postgres";
diff --git a/services/minecraft.nix b/services/minecraft.nix
index 03441bc..d74bd07 100644
--- a/services/minecraft.nix
+++ b/services/minecraft.nix
@@ -4,7 +4,9 @@
   lib,
   ...
 }:
-
+let
+heap_size = "6144M";
+in
 {
   nixpkgs.config.allowUnfreePredicate =
     pkg:
@@ -20,7 +22,8 @@
     servers.${service_configs.minecraft.server_name} = {
       enable = true;
       package = pkgs.fabricServers.fabric-1_21_1;
-      jvmOpts = "-Xmx6144M -Xms6144M -XX:+AlwaysPreTouch -XX:+DisableExplicitGC -XX:+ParallelRefProcEnabled -XX:+PerfDisableSharedMem -XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -XX:G1HeapRegionSize=8M -XX:G1HeapWastePercent=5 -XX:G1MaxNewSizePercent=40 -XX:G1MixedGCCountTarget=4 -XX:G1MixedGCLiveThresholdPercent=90 -XX:G1NewSizePercent=30 -XX:G1RSetUpdatingPauseTimePercent=5 -XX:G1ReservePercent=20 -XX:InitiatingHeapOccupancyPercent=15 -XX:MaxGCPauseMillis=200 -XX:MaxTenuringThreshold=1 -XX:SurvivorRatio=32";
+      # Aikar's flags
+      jvmOpts = "-Xmx${heap_size} -Xms${heap_size} -XX:+AlwaysPreTouch -XX:+DisableExplicitGC -XX:+ParallelRefProcEnabled -XX:+PerfDisableSharedMem -XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -XX:G1HeapRegionSize=8M -XX:G1HeapWastePercent=5 -XX:G1MaxNewSizePercent=40 -XX:G1MixedGCCountTarget=4 -XX:G1MixedGCLiveThresholdPercent=90 -XX:G1NewSizePercent=30 -XX:G1RSetUpdatingPauseTimePercent=5 -XX:G1ReservePercent=20 -XX:InitiatingHeapOccupancyPercent=15 -XX:MaxGCPauseMillis=200 -XX:MaxTenuringThreshold=1 -XX:SurvivorRatio=32";
       serverProperties = {
         server-port = service_configs.ports.minecraft;
         enforce-whitelist = true;