diff --git a/lib/base/dictionary.cpp b/lib/base/dictionary.cpp
index e44cca127..e3b348fa6 100644
--- a/lib/base/dictionary.cpp
+++ b/lib/base/dictionary.cpp
@@ -88,7 +88,7 @@ void Dictionary::Set(const String& key, Value&& value)
 {
 	ObjectLock olock(this);
 
-	m_Data[key].Swap(value);
+	m_Data[key] = std::move(value);
 }
 
 /**
diff --git a/lib/base/value.hpp b/lib/base/value.hpp
index 56fed2c40..476f7b149 100644
--- a/lib/base/value.hpp
+++ b/lib/base/value.hpp
@@ -256,7 +256,7 @@ public:
 		if (!IsObject())
 			return false;
 
-		return (dynamic_pointer_cast<T>(boost::get<Object::Ptr>(m_Value)) != NULL);
+		return (dynamic_cast<T *>(boost::get<Object::Ptr>(m_Value).get()) != NULL);
 	}
 
 	/**