diff --git a/kernel/trunk/gui/event.inc b/kernel/trunk/gui/event.inc
index 8dd41f7308..62be66b4c7 100644
--- a/kernel/trunk/gui/event.inc
+++ b/kernel/trunk/gui/event.inc
@@ -387,7 +387,7 @@ get_event_queue:
 ;info:
 ;   client testing function for get_event_ex
 ;warning:
-;  -don't use [TASK_BASE],[current_slot],[current_slot_idx] - it is not for your slot
+;  -don't use [current_slot],[current_slot_idx] - it is not for your slot
 ;  -may be assumed, that interrupt are disabled
 ;  -it is not restriction for scratched registers
 ;param:
@@ -408,7 +408,7 @@ get_event_alone:
 ;info:
 ;   client testing function for wait_event
 ;warning:
-;  -don't use [TASK_BASE],[current_slot],[current_slot_idx] - it is not for your slot
+;  -don't use [current_slot],[current_slot_idx] - it is not for your slot
 ;  -may be assumed, that interrupt are disabled
 ;  -it is not restriction for scratched registers
 ;param:
@@ -500,7 +500,7 @@ get_event_for_app:                                 ;; used from f10,f11,f23
 ;info:
 ;   client testing function for applications (f10,f23)
 ;warning:
-;  -don't use [TASK_BASE],[current_slot],[current_slot_idx] - it is not for your slot
+;  -don't use [current_slot],[current_slot_idx] - it is not for your slot
 ;  -may be assumed, that interrupt are disabled
 ;  -it is not restriction for scratched registers
 ;param:
diff --git a/kernel/trunk/kernel.asm b/kernel/trunk/kernel.asm
index d781173ed3..5ab1ec71e5 100644
--- a/kernel/trunk/kernel.asm
+++ b/kernel/trunk/kernel.asm
@@ -2131,14 +2131,15 @@ sysfn_zmodif:
 
         mov     eax, edx
         shl     edx, BSF sizeof.WDATA
+        add     edx, window_data
 
-        test    [window_data + edx + WDATA.fl_wstate], WSTATE_USED
+        test    [edx + WDATA.fl_wstate], WSTATE_USED
         jz      .fail
 
         cmp     ecx, 1
         jnz     .set_zmod
 
-        mov     al, [window_data + edx + WDATA.z_modif]
+        movzx   eax, [edx + WDATA.z_modif]
         jmp     .exit
 
 .set_zmod:
@@ -2151,12 +2152,12 @@ sysfn_zmodif:
         cmp     bl, ZPOS_ALWAYS_TOP
         jg      .fail
 
-        mov     [window_data + edx + WDATA.z_modif], bl
+        mov     [edx + WDATA.z_modif], bl
 
-        mov     eax, [window_data + edx + WDATA.box.left]
-        mov     ebx, [window_data + edx + WDATA.box.top]
-        mov     ecx, [window_data + edx + WDATA.box.width]
-        mov     edx, [window_data + edx + WDATA.box.height]
+        mov     eax, [edx + WDATA.box.left]
+        mov     ebx, [edx + WDATA.box.top]
+        mov     ecx, [edx + WDATA.box.width]
+        mov     edx, [edx + WDATA.box.height]
         add     ecx, eax
         add     edx, ebx
         call    window._.set_screen
@@ -3541,7 +3542,7 @@ align 4
 align 4
 @@:
         mov     edi, [current_slot]
-        mov     edi, APPDATA.window
+        mov     edi, [edi + APPDATA.window]
         add     dx, word[edi + WDATA.clientbox.top]
         rol     edx, 16
         add     dx, word[edi + WDATA.clientbox.left]
@@ -3579,11 +3580,11 @@ sys_putimage_palette:
         pop     esi ecx
         jnz     sys_putimage.exit
 
-        mov     eax, [current_slot_idx]
-        shl     eax, BSF sizeof.WDATA
-        add     dx, word [window_data + eax + WDATA.clientbox.top]
+        mov     eax, [current_slot]
+        mov     eax, [eax + APPDATA.window]
+        add     dx, word [eax + WDATA.clientbox.top]
         rol     edx, 16
-        add     dx, word [window_data + eax + WDATA.clientbox.left]
+        add     dx, word [eax + WDATA.clientbox.left]
         rol     edx, 16
 ;--------------------------------------
 align 4
@@ -3892,12 +3893,12 @@ putimage_get16bpp:
         ; edx y end
 ; edi color
 ;__sys_drawbar:
-;        mov     esi, [current_slot_idx]
-;        shl     esi, BSF sizeof.WDATA
-;        add     eax, [window_data+esi+WDATA.clientbox.left]
-;        add     ecx, [window_data+esi+WDATA.clientbox.left]
-;        add     ebx, [window_data+esi+WDATA.clientbox.top]
-;        add     edx, [window_data+esi+WDATA.clientbox.top]
+;        mov     esi, [current_slot]
+;        mov     esi, [esi + APPDATA.window]
+;        add     eax, [esi + WDATA.clientbox.left]
+;        add     ecx, [esi + WDATA.clientbox.left]
+;        add     ebx, [esi + WDATA.clientbox.top]
+;        add     edx, [esi + WDATA.clientbox.top]
 ;--------------------------------------
 ;align 4
 ;.forced:
diff --git a/kernel/trunk/video/vesa12.inc b/kernel/trunk/video/vesa12.inc
index 9237d72a6e..14c11492a3 100644
--- a/kernel/trunk/video/vesa12.inc
+++ b/kernel/trunk/video/vesa12.inc
@@ -256,8 +256,8 @@ vesa12_drawbackground:
         mov     ebx, 3
         mul     ebx
         mov     [imax], eax
-        mov     eax, [draw_data+32+RECT.left]
-        mov     ebx, [draw_data+32+RECT.top]
+        mov     eax, [background_window + WDATA.draw_data.left]
+        mov     ebx, [background_window + WDATA.draw_data.top]
         xor     edi, edi;no force
 
       v12dp3: