diff --git a/LEGO1/mxdsfile.h b/LEGO1/mxdsfile.h
index fe996375..e453cb9a 100644
--- a/LEGO1/mxdsfile.h
+++ b/LEGO1/mxdsfile.h
@@ -36,7 +36,7 @@ class MxDSFile : public MxDSSource {
 
 	inline void SetFileName(const char* p_filename) { m_filename = p_filename; }
 
-	inline int CalcFileSize() { return GetFileSize(m_io.m_info.hmmio, NULL); }
+	inline MxS32 CalcFileSize() { return GetFileSize(m_io.m_info.hmmio, NULL); }
 
 private:
 	MxLong ReadChunks();
diff --git a/LEGO1/mxramstreamcontroller.h b/LEGO1/mxramstreamcontroller.h
index 2ff369be..dc93f50f 100644
--- a/LEGO1/mxramstreamcontroller.h
+++ b/LEGO1/mxramstreamcontroller.h
@@ -1,7 +1,7 @@
 #ifndef MXRAMSTREAMCONTROLLER_H
 #define MXRAMSTREAMCONTROLLER_H
 
-#include "MxDSStreamingAction.h"
+#include "mxdsstreamingaction.h"
 #include "mxdsbuffer.h"
 #include "mxstreamcontroller.h"
 
@@ -31,6 +31,7 @@ class MxRAMStreamController : public MxStreamController {
 
 private:
 	MxDSBuffer m_buffer;
+
 	MxResult DeserializeObject(MxDSStreamingAction& action);
 };
 
diff --git a/LEGO1/mxramstreamprovider.cpp b/LEGO1/mxramstreamprovider.cpp
index c8fd15d8..016bcc8d 100644
--- a/LEGO1/mxramstreamprovider.cpp
+++ b/LEGO1/mxramstreamprovider.cpp
@@ -81,7 +81,7 @@ MxResult MxRAMStreamProvider::SetResourceToGet(MxStreamController* p_resource)
 			if (m_pBufferOfFileSize != NULL &&
 				m_pFile->Read((unsigned char*) m_pBufferOfFileSize, m_fileSize) == SUCCESS) {
 				m_lengthInDWords = m_pFile->GetLengthInDWords();
-				m_bufferForDWords = new MxU32[m_lengthInDWords << 2];
+				m_bufferForDWords = new MxU32[m_lengthInDWords * sizeof(MxU32)];
 
 				if (m_bufferForDWords != NULL) {
 					memcpy(m_bufferForDWords, m_pFile->GetBuffer(), m_lengthInDWords);