diff --git a/LEGO1/modeldb/modeldb.cpp b/LEGO1/modeldb/modeldb.cpp
index 450f7848..62fb2ca5 100644
--- a/LEGO1/modeldb/modeldb.cpp
+++ b/LEGO1/modeldb/modeldb.cpp
@@ -52,8 +52,11 @@ MxResult ModelDbModel::Read(SDL_IOStream* p_file)
 	if (SDL_ReadIO(p_file, m_up, sizeof(m_up)) != sizeof(m_up)) {
 		return FAILURE;
 	}
+	if (SDL_ReadIO(p_file, &m_unk0x34, sizeof(m_unk0x34)) != sizeof(m_unk0x34)) {
+		return FAILURE;
+	}
 
-	return SDL_ReadIO(p_file, &m_unk0x34, sizeof(m_unk0x34)) == sizeof(m_unk0x34) ? SUCCESS : FAILURE;
+	return SUCCESS;
 }
 
 // FUNCTION: LEGO1 0x10027850
@@ -77,9 +80,11 @@ MxResult ModelDbPart::Read(SDL_IOStream* p_file)
 	if (SDL_ReadIO(p_file, &m_partDataLength, sizeof(m_partDataLength)) != sizeof(m_partDataLength)) {
 		return FAILURE;
 	}
+	if (SDL_ReadIO(p_file, &m_partDataOffset, sizeof(m_partDataOffset)) != sizeof(m_partDataOffset)) {
+		return FAILURE;
+	}
 
-	return SDL_ReadIO(p_file, &m_partDataOffset, sizeof(m_partDataOffset)) == sizeof(m_partDataOffset) ? SUCCESS
-																									   : FAILURE;
+	return SUCCESS;
 }
 
 // FUNCTION: LEGO1 0x10027910
diff --git a/LEGO1/omni/src/stream/mxio.cpp b/LEGO1/omni/src/stream/mxio.cpp
index dbc9a78d..49d55ad2 100644
--- a/LEGO1/omni/src/stream/mxio.cpp
+++ b/LEGO1/omni/src/stream/mxio.cpp
@@ -29,7 +29,6 @@ MXIOINFO::~MXIOINFO()
 	Close(0);
 }
 
-#include <windows.h>
 // FUNCTION: LEGO1 0x100cc830
 // FUNCTION: BETA10 0x1015e189
 MxU16 MXIOINFO::Open(const char* p_filename, MxULong p_flags)