diff --git a/src/config/parse_config.h b/src/config/parse_config.h
index 4beb71da..c19e9ab1 100644
--- a/src/config/parse_config.h
+++ b/src/config/parse_config.h
@@ -289,7 +289,7 @@ typedef struct {
 	double mouse_accel_speed;
 	double axis_scroll_factor;
 
-  /* tablet */
+	/* tablet */
 	char *tablet_map_to_mon;
 
 	/* Trackpad */
diff --git a/src/ext-protocol/all.h b/src/ext-protocol/all.h
index 6fdb0744..fac2779d 100644
--- a/src/ext-protocol/all.h
+++ b/src/ext-protocol/all.h
@@ -1,6 +1,6 @@
 #include "dwl-ipc.h"
 #include "ext-workspace.h"
 #include "foreign-toplevel.h"
+#include "tablet.h"
 #include "tearing.h"
 #include "text-input.h"
-#include "tablet.h"
diff --git a/src/fetch/common.h b/src/fetch/common.h
index aa3ae6ff..43f58f82 100644
--- a/src/fetch/common.h
+++ b/src/fetch/common.h
@@ -131,8 +131,8 @@ void xytonode(double x, double y, struct wlr_surface **psurface, Client **pc,
 			for (pnode = node; pnode && !c; pnode = &pnode->parent->node)
 				c = pnode->data;
 			if (c && c->type == LayerShell) {
+				l = (LayerSurface *)c;
 				c = NULL;
-				l = pnode->data;
 			}
 		}