diff --git a/reactos/ntoskrnl/ke/kqueue.c b/reactos/ntoskrnl/ke/kqueue.c
index 2400de65871..8f225babe7e 100644
--- a/reactos/ntoskrnl/ke/kqueue.c
+++ b/reactos/ntoskrnl/ke/kqueue.c
@@ -42,11 +42,11 @@ KeInsertByKeyDeviceQueue (
   }
   
   /* Insert new entry after the last entry with SortKey less or equal to passed-in SortKey */
-  InsertAscendingList(&DeviceQueue->DeviceListHead,
-                      &DeviceQueueEntry->DeviceListEntry,
-                      KDEVICE_QUEUE_ENTRY,
-                      DeviceListEntry,
-                      SortKey);
+  InsertAscendingListFIFO(&DeviceQueue->DeviceListHead,
+                          KDEVICE_QUEUE_ENTRY,
+                          DeviceListEntry,
+                          DeviceQueueEntry,
+                          SortKey);
    
   KeReleaseSpinLockFromDpcLevel(&DeviceQueue->Lock);
   return(TRUE);
diff --git a/reactos/subsys/win32k/ntuser/timer.c b/reactos/subsys/win32k/ntuser/timer.c
index 147ffbf893a..bfd9903f891 100644
--- a/reactos/subsys/win32k/ntuser/timer.c
+++ b/reactos/subsys/win32k/ntuser/timer.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: timer.c,v 1.20 2003/12/26 10:47:20 gvg Exp $
+/* $Id: timer.c,v 1.21 2004/01/18 22:29:38 gdalsnes Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -74,9 +74,9 @@ IntInsertTimerAscendingOrder(PMSG_TIMER_ENTRY NewTimer, BOOL SysTimer)
   ListHead = SysTimer ? &SysTimerListHead : &TimerListHead;
 
   InsertAscendingList(ListHead,
-                      &NewTimer->ListEntry,
                       MSG_TIMER_ENTRY,
-                      ListEntry,
+                      ListEntry,                      
+                      NewTimer,
                       Timeout.QuadPart);
                       
   return IsFirstEntry(ListHead, &NewTimer->ListEntry);