diff --git a/game/server/application/SwgDatabaseServer/src/shared/buffers/ObjvarBuffer.cpp b/game/server/application/SwgDatabaseServer/src/shared/buffers/ObjvarBuffer.cpp
index bb2c58f7..b3c52b05 100755
--- a/game/server/application/SwgDatabaseServer/src/shared/buffers/ObjvarBuffer.cpp
+++ b/game/server/application/SwgDatabaseServer/src/shared/buffers/ObjvarBuffer.cpp
@@ -199,7 +199,7 @@ bool ObjvarBuffer::save(DB::Session *session)
 
 // ----------------------------------------------------------------------
 
-void ObjvarBuffer::getObjvarsForObject(const NetworkId &objectId, std::vector<DynamicVariableList::MapType::Command> &commands) const
+void ObjvarBuffer::getObjvarsForObject(const NetworkId objectId, std::vector<DynamicVariableList::MapType::Command> commands) const
 {
 	DynamicVariableList::MapType::Command c;
 
@@ -258,7 +258,7 @@ void ObjvarBuffer::getObjvarsForObject(const NetworkId &objectId, std::vector<Dy
 
 // ----------------------------------------------------------------------
 
-void ObjvarBuffer::updateObjvars(const NetworkId &objectId, const std::vector<DynamicVariableList::MapType::Command> &commands)
+void ObjvarBuffer::updateObjvars(const NetworkId objectId, const std::vector<DynamicVariableList::MapType::Command> commands)
 {
 	bool override=false; // flag that we're dealing with the gold data override case (storing an objvar change in the live database, on an object that came from the gold database)
 	if (ConfigServerDatabase::getEnableGoldDatabase() && objectId < ConfigServerDatabase::getMaxGoldNetworkId())
diff --git a/game/server/application/SwgDatabaseServer/src/shared/buffers/ObjvarBuffer.h b/game/server/application/SwgDatabaseServer/src/shared/buffers/ObjvarBuffer.h
index f82adae7..baedb097 100755
--- a/game/server/application/SwgDatabaseServer/src/shared/buffers/ObjvarBuffer.h
+++ b/game/server/application/SwgDatabaseServer/src/shared/buffers/ObjvarBuffer.h
@@ -49,10 +49,10 @@ public:
 	virtual bool save(DB::Session *session);
 	virtual void removeObject(const NetworkId &object);
 		
-	DBSchema::ObjectVariableRow *findRowByIndex(const NetworkId &objectId, const std::string &name);
+	DBSchema::ObjectVariableRow *findRowByIndex(const NetworkId objectId, const std::string &name);
 
-	void updateObjvars(const NetworkId &objectId, const std::vector<DynamicVariableList::MapType::Command> &commands);
-	void getObjvarsForObject(const NetworkId &objectId, std::vector<DynamicVariableList::MapType::Command> &commands) const;
+	void updateObjvars(const NetworkId objectId, const std::vector<DynamicVariableList::MapType::Command> commands);
+	void getObjvarsForObject(const NetworkId objectId, std::vector<DynamicVariableList::MapType::Command> commands) const;
 	
   private:
 	struct IndexKey