diff --git a/wm_hooks/wm_hooks.cxx b/wm_hooks/wm_hooks.cxx
index 6923db7..9b7dae4 100644
--- a/wm_hooks/wm_hooks.cxx
+++ b/wm_hooks/wm_hooks.cxx
@@ -1,5 +1,5 @@
-/* Copyright (C) 2002-2003 RealVNC Ltd.  All Rights Reserved.
- *    
+/* Copyright (C) 2002-2005 RealVNC Ltd.  All Rights Reserved.
+ * 
  * This is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
@@ -187,6 +187,10 @@
     }
     break;
 
+  case WM_WINDOWPOSCHANGED:
+    NotifyWindow(wnd, msg);
+    break;
+
 	case WM_PAINT:
     // *** could improve this
     NotifyWindowClientArea(wnd, msg);
@@ -329,7 +333,7 @@
   hook_target = thread;
 
   hook_CallWndProc = SetWindowsHookEx(WH_CALLWNDPROC, HookCallWndProc, dll_instance, thread);
-  //hook_CallWndProcRet = SetWindowsHookEx(WH_CALLWNDPROCRET, HookCallWndProcRet, dll_instance, thread);
+  hook_CallWndProcRet = SetWindowsHookEx(WH_CALLWNDPROCRET, HookCallWndProcRet, dll_instance, thread);
   hook_GetMessage = SetWindowsHookEx(WH_GETMESSAGE, HookGetMessage, dll_instance, thread);
   hook_DialogMessage = SetWindowsHookEx(WH_SYSMSGFILTER, HookDialogMessage, dll_instance, thread);
 
@@ -427,7 +431,7 @@
   return success;
 }
 #else
-#pragma message("WARNING: low-level mouse and keyboard hooks not supported")
+#pragma message("  NOTE: low-level mouse and keyboard hooks not supported")
 #endif
 
 // - WM_Hooks_EnableRealInputs
@@ -458,5 +462,5 @@
 
 BOOL WM_Hooks_EnableCursorShape(BOOL enable) {
   enable_cursor_shape = enable;
-  return FALSE;
+  return TRUE;
 }