diff --git a/README.md b/README.md
index 9d14d06b..9b558fd1 100644
--- a/README.md
+++ b/README.md
@@ -99,6 +99,34 @@ Then, install the package:
 dnf install mangowc
 ```
 
+## GuixSD
+The package definition is described in the source repository.
+First, add `mangowc` channel to `channels.scm` file:
+
+```scheme
+;; In $HOME/.config/guix/channels.scm
+(cons (channel
+        (name 'mangowc)
+        (url "https://github.com/DreamMaoMao/mangowc.git"))
+      ... ;; Your other channels
+      %default-channels)
+```
+
+Then, run `guix pull` and after update you can either run
+`guix install mangowc` or add it to your configuration via:
+
+```scheme
+(use-modules (mangowc)) ;; Add mangowc module
+
+;; Add mangowc to packages list
+(packages (cons 
+            mangowc
+            ... ;; Other packages you specified
+            %base-packages))
+```
+
+And then rebuild your system.
+
 ## Other
 
 ```bash
diff --git a/meson.build b/meson.build
index e7979bdf..5b19f9fc 100644
--- a/meson.build
+++ b/meson.build
@@ -56,7 +56,7 @@ endif
 if is_git_repo
   # 如果是 Git 目录，获取 Commit Hash 和最新的 tag
   commit_hash = run_command(git, 'rev-parse', '--short', 'HEAD', check : false).stdout().strip()
-  latest_tag = run_command(git, 'describe', '--tags', '--abbrev=0', check : false).stdout().strip()
+  latest_tag = meson.project_version()
   version_with_hash = '@0@(@1@)'.format(latest_tag, commit_hash)
 else
   # 如果不是 Git 目录，使用项目版本号和 "release" 字符串
diff --git a/src/client/client.h b/src/client/client.h
index e9519106..fd81a800 100644
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -325,14 +325,15 @@ static inline uint32_t client_set_size(Client *c, uint32_t width,
 
 		struct wlr_surface_state *state =
 			&c->surface.xwayland->surface->current;
-		struct wlr_box new_geo = {0};
-		new_geo.width = state->width;
-		new_geo.height = state->height;
-		if (c->geom.width - 2 * c->bw == new_geo.width &&
-			c->geom.height - 2 * c->bw == new_geo.height &&
-			c->surface.xwayland->x == c->geom.x + c->bw &&
-			c->surface.xwayland->y == c->geom.y + c->bw) {
-			c->configure_serial = 0;
+
+		if ((int32_t)c->geom.width - 2 * (int32_t)c->bw ==
+				(int32_t)state->width &&
+			(int32_t)c->geom.height - 2 * (int32_t)c->bw ==
+				(int32_t)state->height &&
+			(int32_t)c->surface.xwayland->x ==
+				(int32_t)c->geom.x + (int32_t)c->bw &&
+			(int32_t)c->surface.xwayland->y ==
+				(int32_t)c->geom.y + (int32_t)c->bw) {
 			return 0;
 		}
 
diff --git a/src/mango.c b/src/mango.c
index f0aefec3..540395ae 100644
--- a/src/mango.c
+++ b/src/mango.c
@@ -4506,7 +4506,7 @@ void rendermon(struct wl_listener *listener, void *data) {
 		need_more_frames = client_draw_frame(c) || need_more_frames;
 		if (!animations && !(allow_tearing && frame_allow_tearing) &&
 			c->configure_serial && client_is_rendered_on_mon(c, m) &&
-			!client_is_stopped(c)) {
+			!client_is_stopped(c) && !grabc) {
 			monitor_check_skip_frame_timeout(m);
 			goto skip;
 		}
@@ -6285,13 +6285,14 @@ void createnotifyx11(struct wl_listener *listener, void *data) {
 void commitx11(struct wl_listener *listener, void *data) {
 	Client *c = wl_container_of(listener, c, commmitx11);
 	struct wlr_surface_state *state = &c->surface.xwayland->surface->current;
-	struct wlr_box new_geo = {0};
-	new_geo.width = state->width;
-	new_geo.height = state->height;
-	if (c->geom.width - 2 * c->bw == new_geo.width &&
-		c->geom.height - 2 * c->bw == new_geo.height &&
-		c->surface.xwayland->x == c->geom.x + c->bw &&
-		c->surface.xwayland->y == c->geom.y + c->bw) {
+
+	if ((int32_t)c->geom.width - 2 * (int32_t)c->bw == (int32_t)state->width &&
+		(int32_t)c->geom.height - 2 * (int32_t)c->bw ==
+			(int32_t)state->height &&
+		(int32_t)c->surface.xwayland->x ==
+			(int32_t)c->geom.x + (int32_t)c->bw &&
+		(int32_t)c->surface.xwayland->y ==
+			(int32_t)c->geom.y + (int32_t)c->bw) {
 		c->configure_serial = 0;
 	}
 }