diff --git a/zone/command.cpp b/zone/command.cpp
index afaa493ea..bef50e184 100644
--- a/zone/command.cpp
+++ b/zone/command.cpp
@@ -8746,9 +8746,9 @@ void command_object(Client *c, const Seperator *sep)
 		// Verify no other objects already in this spot (accidental double-click of Hotkey?)
 		query = StringFormat(
 		    "SELECT COUNT(*) FROM object WHERE zoneid = %u "
-		    "AND version=%u AND (posx BETWEEN %.1f AND %.1f) "
-		    "AND (posy BETWEEN %.1f AND %.1f) "
-		    "AND (posz BETWEEN %.1f AND %.1f)",
+		    "AND version=%u AND (xpos BETWEEN %.1f AND %.1f) "
+		    "AND (ypos BETWEEN %.1f AND %.1f) "
+		    "AND (zpos BETWEEN %.1f AND %.1f)",
 		    zone->GetZoneID(), zone->GetInstanceVersion(), od.x - 0.2f,
 		    od.x + 0.2f,	       // Yes, we're actually using a bounding box instead of a radius.
 		    od.y - 0.2f, od.y + 0.2f,  // Much less processing power used this way.
diff --git a/zone/forage.cpp b/zone/forage.cpp
index 5d21d599f..be93d39ae 100644
--- a/zone/forage.cpp
+++ b/zone/forage.cpp
@@ -196,7 +196,7 @@ bool Client::CanFish() {
 
 		float step_size = RuleR(Watermap, FishingLineStepSize);
 
-		for(float i = 0.0f; i < len; i += step_size) {
+		for(float i = 0.0f; i < LineLength; i += step_size) {
 			glm::vec3 dest(rodPosition.x, rodPosition.y, m_Position.z - i);
 
 			bool in_lava = zone->watermap->InLava(dest);