diff --git a/source/network/NetMessageSim.cpp b/source/network/NetMessageSim.cpp
index 75753d6cac..28b0dfeb33 100644
--- a/source/network/NetMessageSim.cpp
+++ b/source/network/NetMessageSim.cpp
@@ -128,7 +128,7 @@ CSimulationMessage::CSimulationMessage(const CSimulationMessage& orig) :
 	m_Turn(orig.m_Turn),
 	CNetMessage(orig)
 {
-	m_Data.set(orig.m_Data);
+	m_Data = orig.m_Data;
 }
 
 u8* CSimulationMessage::Serialize(u8* pBuffer) const
diff --git a/source/network/NetServer.cpp b/source/network/NetServer.cpp
index 1e19da2aff..c7ac20ef70 100644
--- a/source/network/NetServer.cpp
+++ b/source/network/NetServer.cpp
@@ -1364,7 +1364,7 @@ void CNetServerWorker::UpdateGameAttributes(JS::MutableHandleValue attrs)
 		return;
 
 	CGameSetupMessage gameSetupMessage(GetScriptInterface());
-	gameSetupMessage.m_Data.set(m_GameAttributes.get());
+	gameSetupMessage.m_Data = m_GameAttributes.get();
 	Broadcast(&gameSetupMessage);
 }
 
diff --git a/source/simulation2/components/ICmpAIManager.cpp b/source/simulation2/components/ICmpAIManager.cpp
index ee631ce827..316618f32c 100644
--- a/source/simulation2/components/ICmpAIManager.cpp
+++ b/source/simulation2/components/ICmpAIManager.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2012 Wildfire Games.
+/* Copyright (C) 2015 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -44,7 +44,7 @@ public:
 	{
 		JSContext* cx = m_ScriptInterface.GetContext();
 		JSAutoRequest rq(cx);
-		m_AIs.set(JS_NewArrayObject(cx, 0));
+		m_AIs = JS_NewArrayObject(cx, 0);
 	}
 
 	void Run()
diff --git a/source/simulation2/helpers/SimulationCommand.h b/source/simulation2/helpers/SimulationCommand.h
index b5766da32d..8845cfa39f 100644
--- a/source/simulation2/helpers/SimulationCommand.h
+++ b/source/simulation2/helpers/SimulationCommand.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2010 Wildfire Games.
+/* Copyright (C) 2015 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -41,7 +41,7 @@ struct SimulationCommand
 	SimulationCommand& operator=(SimulationCommand&& other)
 	{
 		this->player = other.player;
-		this->data.set(other.data);
+		this->data = other.data;
 		return *this;
 	}
 
diff --git a/source/simulation2/serialization/StdDeserializer.cpp b/source/simulation2/serialization/StdDeserializer.cpp
index b3740e0fe3..b3b131319a 100644
--- a/source/simulation2/serialization/StdDeserializer.cpp
+++ b/source/simulation2/serialization/StdDeserializer.cpp
@@ -38,7 +38,7 @@ CStdDeserializer::CStdDeserializer(ScriptInterface& scriptInterface, std::istrea
 
 	// Add a dummy tag because the serializer uses the tag 0 to indicate that a value
 	// needs to be serialized and then tagged
-	m_dummyObject.set(JS_NewObject(cx, nullptr, JS::NullPtr(), JS::NullPtr()));
+	m_dummyObject = JS_NewObject(cx, nullptr, JS::NullPtr(), JS::NullPtr());
 	m_ScriptBackrefs.push_back(JS::Heap<JSObject*>(m_dummyObject));
 }