diff --git a/src/elements/Frame.lua b/src/elements/Frame.lua
index c892ce4..43d53b1 100644
--- a/src/elements/Frame.lua
+++ b/src/elements/Frame.lua
@@ -117,7 +117,7 @@ end
 --- @return boolean handled Whether the event was handled
 --- @protected
 function Frame:mouse_drag(button, x, y)
-    if self.get("clicked") and self.dragging then
+    if self:hasState("clicked") and self.dragging then
         local newX = x - self.dragStartX
         local newY = y - self.dragStartY
 
diff --git a/src/elements/List.lua b/src/elements/List.lua
index 1f9fc70..92673e8 100644
--- a/src/elements/List.lua
+++ b/src/elements/List.lua
@@ -318,6 +318,7 @@ end
 --- @shortDescription Renders the list
 --- @protected
 function List:render(vOffset)
+    vOffset = vOffset or 0
     Collection.render(self)
 
     local items = self.get("items")