diff --git a/modules/sellvalue.lua b/modules/sellvalue.lua
index f854d089..06bb1567 100644
--- a/modules/sellvalue.lua
+++ b/modules/sellvalue.lua
@@ -28,21 +28,22 @@ pfUI:RegisterModule("sellvalue", "vanilla:tbc", function ()
     end
   end
 
-  pfUI.sellvalue = CreateFrame( "Frame" , "pfGameTooltip", GameTooltip )
+  pfUI.sellvalue = CreateFrame("Frame", "pfGameTooltip", GameTooltip)
   pfUI.sellvalue:SetScript("OnShow", function()
-    if libtooltip:GetItemLink() then
-      local id = libtooltip:GetItemID()
-      local count = tonumber(libtooltip:GetItemCount()) or 1
-      AddVendorPrices(GameTooltip, id, math.max(count, 1))
+    if GameTooltip:HasItem() then
+      local _, _, id = GameTooltip:GetItem()
+      if id then
+        local count = tonumber(libtooltip:GetItemCount()) or 1
+        AddVendorPrices(GameTooltip, id, math.max(count, 1))
+      end
     end
   end)
 
-  local HookSetItemRef = SetItemRef
-  _G.SetItemRef = function(link, text, button)
-    local item, _, id = string.find(link, "item:(%d+):.*")
-    HookSetItemRef(link, text, button)
-    if not IsAltKeyDown() and not IsShiftKeyDown() and not IsControlKeyDown() and item then
-      AddVendorPrices(ItemRefTooltip, tonumber(id), 1)
+  hooksecurefunc("SetItemRef", function()
+    if IsAltKeyDown() or IsShiftKeyDown() or IsControlKeyDown() then return end
+    if ItemRefTooltip:HasItem() then
+      local _, _, id = ItemRefTooltip:GetItem()
+      if id then AddVendorPrices(ItemRefTooltip, id, 1) end
     end
-  end
+  end)
 end)
diff --git a/modules/unusable.lua b/modules/unusable.lua
index 73a9d992..b0eb8c80 100644
--- a/modules/unusable.lua
+++ b/modules/unusable.lua
@@ -41,16 +41,12 @@ pfUI:RegisterModule("unusable", "vanilla:tbc", function ()
   end
 
   -- update on regular pfUI button updates
-  local HookUpdateSlot = pfUI.bag.UpdateSlot
-  pfUI.bag.UpdateSlot = function(self, bag, slot)
-    HookUpdateSlot(self, bag, slot)
+  hooksecurefunc(pfUI.bag, "UpdateSlot", function(self, bag, slot)
     pfUI.unusable:UpdateSlot(bag, slot)
-  end
+  end)
 
   -- update on bank frame itemlock updates
-  local HookBankFrameItemButton_UpdateLock = BankFrameItemButton_UpdateLock
-  _G.BankFrameItemButton_UpdateLock = function()
-    HookBankFrameItemButton_UpdateLock()
+  hooksecurefunc("BankFrameItemButton_UpdateLock", function()
     pfUI.unusable:UpdateSlot(-1, this:GetID())
-  end
+  end)
 end)