diff --git a/src/InputStream.c b/src/InputStream.c
index 33b42d8..df70c7b 100644
--- a/src/InputStream.c
+++ b/src/InputStream.c
@@ -465,7 +465,7 @@ static int sendEnableHaptics(void) {
 
     // Avoid sending this on earlier server versions, since they may terminate
     // the connection upon receiving an unexpected packet.
-    if (AppVersionQuad[0] < 7 || (AppVersionQuad[0] == 7 && AppVersionQuad[1] < 1)) {
+    if (!APP_VERSION_AT_LEAST(7, 1, 0)) {
         return 0;
     }
 
diff --git a/src/SdpGenerator.c b/src/SdpGenerator.c
index 029dff2..4a848ed 100644
--- a/src/SdpGenerator.c
+++ b/src/SdpGenerator.c
@@ -361,9 +361,7 @@ static PSDP_OPTION getAttributesList(char*urlSafeAddr) {
                 }
             }
 
-            if (AppVersionQuad[0] < 7 ||
-                (AppVersionQuad[0] == 7 && AppVersionQuad[1] < 1) ||
-                (AppVersionQuad[0] == 7 && AppVersionQuad[1] == 1 && AppVersionQuad[2] < 408)) {
+            if (!APP_VERSION_AT_LEAST(7, 1, 408)) {
                 // This disables split frame encode on GFE 3.10 which seems to produce broken
                 // HEVC output at 1080p60 (full of artifacts even on the SHIELD itself, go figure).
                 // It now appears to work fine on GFE 3.14.1.