diff --git a/ejson/FilePos.hpp b/ejson/FilePos.hpp
index 94b4db4..2a67d50 100644
--- a/ejson/FilePos.hpp
+++ b/ejson/FilePos.hpp
@@ -6,6 +6,7 @@
 #pragma once
 
 #include <etk/types.hpp>
+#include <etk/Stream.hpp>
 
 namespace ejson {
 	/**
diff --git a/ejson/internal/Object.cpp b/ejson/internal/Object.cpp
index af67750..110464f 100644
--- a/ejson/internal/Object.cpp
+++ b/ejson/internal/Object.cpp
@@ -207,7 +207,7 @@ bool ejson::internal::Object::iParse(const etk::String& _data, size_t& _pos, ejs
 		}
 	}
 	_pos = _data.size();
-	if (false == standalone) {
+	if (standalone == false) {
 		return true;
 	}
 	return false;
@@ -301,11 +301,11 @@ size_t ejson::internal::Object::size() const {
 }
 
 ememory::SharedPtr<ejson::internal::Value> ejson::internal::Object::get(size_t _id) {
-	return m_value[_id];
+	return m_value.getValue(_id);
 }
 
 const ememory::SharedPtr<ejson::internal::Value> ejson::internal::Object::get(size_t _id) const{
-	return m_value[_id];
+	return m_value.getValue(_id);
 }
 
 ememory::SharedPtr<ejson::internal::Value> ejson::internal::Object::get(const etk::String& _name) {