diff --git a/.github/workflows/jekyll.yml b/.github/workflows/jekyll.yml
index 062315869..af5448869 100644
--- a/.github/workflows/jekyll.yml
+++ b/.github/workflows/jekyll.yml
@@ -43,19 +43,26 @@ jobs:
       - name: Setup Pages
         id: pages
         uses: actions/configure-pages@v5
+      - name: Setup Jekyll
+        run: bundle install
+        working-directory: ./website
       - name: Build with Jekyll
         # Outputs to the './_site' directory by default
-        run: bundle exec jekyll build --baseurl "${{ steps.pages.outputs.base_path }}"
+        run: bundle exec jekyll build --baseurl "/website"
+        working-directory: ./website
         env:
           JEKYLL_ENV: production
       - name: Upload artifact
         # Automatically uploads an artifact from the './_site' directory by default
         uses: actions/upload-pages-artifact@v3
+        with:
+          name: github-pages
+          path: "./website/_site"
 
   # Deployment job
   deploy:
     environment:
-      name: github-pages
+      name: xlibre_website
       url: ${{ steps.deployment.outputs.page_url }}
     runs-on: ubuntu-latest
     needs: build
diff --git a/Xext/namespace/hook-windowproperty.c b/Xext/namespace/hook-windowproperty.c
index f427c634f..afd478369 100644
--- a/Xext/namespace/hook-windowproperty.c
+++ b/Xext/namespace/hook-windowproperty.c
@@ -11,14 +11,6 @@
 #include "namespace.h"
 #include "hooks.h"
 
-static inline Bool winIsRoot(WindowPtr pWin) {
-    if (!pWin)
-        return FALSE;
-    if (pWin->drawable.pScreen->root == pWin)
-        return TRUE;
-    return FALSE;
-}
-
 void hookWindowProperty(CallbackListPtr *pcbl, void *unused, void *calldata)
 {
     XNS_HOOK_HEAD(PropertyFilterParam);
diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c
index cd3b2e0a8..6a7ca7c55 100644
--- a/hw/vfb/InitOutput.c
+++ b/hw/vfb/InitOutput.c
@@ -259,13 +259,6 @@ ddxGiveUp(enum ExitCode error)
     }
 }
 
-#ifdef __APPLE__
-void
-DarwinHandleGUI(int argc, char *argv[])
-{
-}
-#endif
-
 void
 OsVendorInit(void)
 {
diff --git a/hw/xnest/Init.c b/hw/xnest/Init.c
index 8f88c1edd..1eb49b645 100644
--- a/hw/xnest/Init.c
+++ b/hw/xnest/Init.c
@@ -154,13 +154,6 @@ ddxGiveUp(enum ExitCode error)
     xnestCloseDisplay();
 }
 
-#ifdef __APPLE__
-void
-DarwinHandleGUI(int argc, char *argv[])
-{
-}
-#endif
-
 void
 OsVendorInit(void)
 {
diff --git a/hw/xquartz/applewm.c b/hw/xquartz/applewm.c
index 41ae6f280..096f7fc7b 100644
--- a/hw/xquartz/applewm.c
+++ b/hw/xquartz/applewm.c
@@ -690,7 +690,6 @@ SNotifyEvent(xAppleWMNotifyEvent *from, xAppleWMNotifyEvent *to)
 static int
 SProcAppleWMQueryVersion(register ClientPtr client)
 {
-    REQUEST(xAppleWMQueryVersionReq);
     return ProcAppleWMQueryVersion(client);
 }
 
diff --git a/hw/xquartz/mach-startup/bundle_trampoline.c b/hw/xquartz/mach-startup/bundle_trampoline.c
index f8611269b..9c58f3ee8 100644
--- a/hw/xquartz/mach-startup/bundle_trampoline.c
+++ b/hw/xquartz/mach-startup/bundle_trampoline.c
@@ -50,7 +50,7 @@
  * needs and simply execs the startup script which then execs the main binary.
  */
 
-static char *executable_path() {
+static char *executable_path(void) {
     uint32_t bufsize = PATH_MAX;
     char *buf = calloc(1, bufsize);
 
diff --git a/hw/xquartz/xpr/appledri.c b/hw/xquartz/xpr/appledri.c
index c01ee9bf7..7810df86a 100644
--- a/hw/xquartz/xpr/appledri.c
+++ b/hw/xquartz/xpr/appledri.c
@@ -394,7 +394,6 @@ SNotifyEvent(xAppleDRINotifyEvent *from,
 static int
 SProcAppleDRIQueryVersion(register ClientPtr client)
 {
-    REQUEST(xAppleDRIQueryVersionReq);
     return ProcAppleDRIQueryVersion(client);
 }
 
diff --git a/website/_config.yml b/website/_config.yml
index 2f82186c1..d08c0ffa5 100644
--- a/website/_config.yml
+++ b/website/_config.yml
@@ -23,7 +23,7 @@ title: X11Libre
 description: >- # this means to ignore newlines until "baseurl:"
   This is the website for the X11Libre project which is an open-source initiative
   focused on providing a modern, libre implementation of the X11 protocol and related tools.
-baseurl: "/xlibre/website" # the subpath of your site, e.g. /blog
+baseurl: "/xlibre" # the subpath of your site, e.g. /blog
 url: "https://xgui4.github.io" # the base hostname & protocol for your site, e.g. http://example.com
 github_username: xgui4
 
diff --git a/website/_data/navigation.yml b/website/_data/navigation.yml
index 88d54ab6f..1d0698878 100644
--- a/website/_data/navigation.yml
+++ b/website/_data/navigation.yml
@@ -1,16 +1,16 @@
 - name: Home
   page: /
-  link: /x11libre-website/
-  link: /x11libre-website/index.html
+  link: /xlibre/
+  link: /xlibre/index.html
 - name: About
   page: /about.html
-  link: /x11libre-website/about.html
+  link: /xlibre/about.html
 - name: Download
   page: /download.html
-  link: /x11libre-website/download.html
+  link: /xlibre/download.html
 - name: FAQ & Privacy
   page: /faq.html
-  link: /x11libre-website/faq.html
+  link: /xlibre/faq.html
 - name: Wiki
   page: /wiki.html
-  link: /x11libre-website/wiki.html
+  link: /xlibre/wiki.html