diff --git a/kernel/trunk/fs/fs_lfn.inc b/kernel/trunk/fs/fs_lfn.inc
index 5650b8bff..578422b65 100644
--- a/kernel/trunk/fs/fs_lfn.inc
+++ b/kernel/trunk/fs/fs_lfn.inc
@@ -902,7 +902,7 @@ biosdisk_enum_root:
         xor     eax, eax
         ret
 .big:
-        push    ecx
+        push    ecx edx
         push    -'0'
         mov     ecx, 10
 @@:
@@ -917,7 +917,7 @@ biosdisk_enum_root:
         add     al, '0'
         stosb
         jnz     @b
-        pop     ecx
+        pop     edx ecx
         pop     eax
         inc     eax
         ret
diff --git a/kernel/trunk/gui/window.inc b/kernel/trunk/gui/window.inc
index e4886fc15..2cb04f94a 100644
--- a/kernel/trunk/gui/window.inc
+++ b/kernel/trunk/gui/window.inc
@@ -319,6 +319,9 @@ syscall_move_window: ;///// system function 67 ////////////////////////////////
         shl     edi, 5
         add     edi, window_data
 
+        test    [edi + WDATA.fl_wdrawn], 1
+        jz      .exit
+
         test    [edi + WDATA.fl_wstate], WSTATE_MAXIMIZED
         jnz     .exit
 
@@ -1437,6 +1440,7 @@ window._.sys_set_window: ;/////////////////////////////////////////////////////
         ; was it already defined before?
         test    [edi + WDATA.fl_wdrawn], 1
         jnz     .set_client_box
+        or      [edi + WDATA.fl_wdrawn], 1
 
         ; NOTE: commented out since doesn't provide necessary functionality
         ;       anyway, to be reworked
diff --git a/kernel/trunk/kernel.asm b/kernel/trunk/kernel.asm
index dbefe701b..1520c2c1f 100644
--- a/kernel/trunk/kernel.asm
+++ b/kernel/trunk/kernel.asm
@@ -2907,11 +2907,6 @@ sys_redrawstat:
         mov     eax, [Screen_Max_Y]
         mov     [edx + RECT.bottom], eax
 
-        mov     edi, [TASK_BASE]
-        or      [edi - twdw + WDATA.fl_wdrawn], 1   ; no new position & buttons from app
-        call    sys_window_mouse
-        ret
-
   srl1:
         ret