diff --git a/lib/rex/post/meterpreter/extensions/stdapi/tlv.rb b/lib/rex/post/meterpreter/extensions/stdapi/tlv.rb
index b56f22a102..510bd24330 100644
--- a/lib/rex/post/meterpreter/extensions/stdapi/tlv.rb
+++ b/lib/rex/post/meterpreter/extensions/stdapi/tlv.rb
@@ -12,10 +12,10 @@ module Stdapi
 #
 ##
 
-TLV_TYPE_HANDLE             = TLV_META_TYPE_UINT    |  600
+TLV_TYPE_HANDLE             = TLV_META_TYPE_QWORD   |  600
 TLV_TYPE_INHERIT            = TLV_META_TYPE_BOOL    |  601
-TLV_TYPE_PROCESS_HANDLE     = TLV_META_TYPE_UINT    |  630
-TLV_TYPE_THREAD_HANDLE      = TLV_META_TYPE_UINT    |  631
+TLV_TYPE_PROCESS_HANDLE     = TLV_META_TYPE_QWORD   |  630
+TLV_TYPE_THREAD_HANDLE      = TLV_META_TYPE_QWORD   |  631
 TLV_TYPE_PRIVILEGE          = TLV_META_TYPE_STRING  |  632
 
 ##
@@ -100,7 +100,7 @@ PROCESS_EXECUTE_FLAG_DESKTOP          = (1 << 4)
 PROCESS_EXECUTE_FLAG_SESSION          = (1 << 5)
 
 # Registry
-TLV_TYPE_HKEY               = TLV_META_TYPE_UINT    | 1000
+TLV_TYPE_HKEY               = TLV_META_TYPE_QWORD   | 1000
 TLV_TYPE_ROOT_KEY           = TLV_TYPE_HKEY
 TLV_TYPE_BASE_KEY           = TLV_META_TYPE_STRING  | 1001
 TLV_TYPE_PERMISSION         = TLV_META_TYPE_UINT    | 1002
@@ -147,7 +147,7 @@ TLV_TYPE_PROCESS_SESSION    = TLV_META_TYPE_UINT    | 2308
 TLV_TYPE_IMAGE_FILE         = TLV_META_TYPE_STRING  | 2400
 TLV_TYPE_IMAGE_FILE_PATH    = TLV_META_TYPE_STRING  | 2401
 TLV_TYPE_PROCEDURE_NAME     = TLV_META_TYPE_STRING  | 2402
-TLV_TYPE_PROCEDURE_ADDRESS  = TLV_META_TYPE_UINT    | 2403
+TLV_TYPE_PROCEDURE_ADDRESS  = TLV_META_TYPE_QWORD   | 2403
 TLV_TYPE_IMAGE_BASE         = TLV_META_TYPE_UINT    | 2404
 TLV_TYPE_IMAGE_GROUP        = TLV_META_TYPE_GROUP   | 2405
 TLV_TYPE_IMAGE_NAME         = TLV_META_TYPE_STRING  | 2406
@@ -155,8 +155,8 @@ TLV_TYPE_IMAGE_NAME         = TLV_META_TYPE_STRING  | 2406
 TLV_TYPE_THREAD_ID          = TLV_META_TYPE_UINT    | 2500
 TLV_TYPE_THREAD_PERMS       = TLV_META_TYPE_UINT    | 2502
 TLV_TYPE_EXIT_CODE          = TLV_META_TYPE_UINT    | 2510
-TLV_TYPE_ENTRY_POINT        = TLV_META_TYPE_UINT    | 2511
-TLV_TYPE_ENTRY_PARAMETER    = TLV_META_TYPE_UINT    | 2512
+TLV_TYPE_ENTRY_POINT        = TLV_META_TYPE_QWORD   | 2511
+TLV_TYPE_ENTRY_PARAMETER    = TLV_META_TYPE_QWORD   | 2512
 TLV_TYPE_CREATION_FLAGS     = TLV_META_TYPE_UINT    | 2513
 
 TLV_TYPE_REGISTER_NAME      = TLV_META_TYPE_STRING  | 2540
@@ -189,7 +189,7 @@ TLV_TYPE_DESKTOP_SCREENSHOT_PE64DLL_BUFFER = TLV_META_TYPE_STRING | 3012
 #
 ##
 TLV_TYPE_EVENT_SOURCENAME   = TLV_META_TYPE_STRING  | 4000
-TLV_TYPE_EVENT_HANDLE       = TLV_META_TYPE_UINT    | 4001
+TLV_TYPE_EVENT_HANDLE       = TLV_META_TYPE_QWORD   | 4001
 TLV_TYPE_EVENT_NUMRECORDS   = TLV_META_TYPE_UINT    | 4002
 
 TLV_TYPE_EVENT_READFLAGS    = TLV_META_TYPE_UINT    | 4003