diff --git a/LEGO1/lego/legoomni/src/control/mxcontrolpresenter.cpp b/LEGO1/lego/legoomni/src/control/mxcontrolpresenter.cpp
index c65f2d1e..ae131445 100644
--- a/LEGO1/lego/legoomni/src/control/mxcontrolpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/control/mxcontrolpresenter.cpp
@@ -239,7 +239,7 @@ void MxControlPresenter::VTable0x6c(MxS16 p_val)
 
 	MxS16 i = 0;
 	for (MxCompositePresenterList::iterator it = m_list.begin(); it != m_list.end(); it++) {
-		(*it)->Enable((m_unk0x4c == 3 && m_unk0x4e == 0 || !IsEnabled()) ? FALSE : m_unk0x4e == i);
+		(*it)->Enable(((m_unk0x4c == 3 && m_unk0x4e == 0) || !IsEnabled()) ? FALSE : m_unk0x4e == i);
 		i++;
 	}
 }
diff --git a/LEGO1/lego/legoomni/src/main/legoomni.cpp b/LEGO1/lego/legoomni/src/main/legoomni.cpp
index 02ea5772..153d5522 100644
--- a/LEGO1/lego/legoomni/src/main/legoomni.cpp
+++ b/LEGO1/lego/legoomni/src/main/legoomni.cpp
@@ -537,7 +537,7 @@ MxResult LegoOmni::Create(MxOmniCreateParam& p_param)
 		return FAILURE;
 	}
 
-	if (m_soundManager = new LegoSoundManager()) {
+	if ((m_soundManager = new LegoSoundManager())) {
 		if (m_soundManager->Create(10, 0) != SUCCESS) {
 			delete m_soundManager;
 			m_soundManager = NULL;
@@ -545,14 +545,14 @@ MxResult LegoOmni::Create(MxOmniCreateParam& p_param)
 		}
 	}
 
-	if (m_videoManager = new LegoVideoManager()) {
+	if ((m_videoManager = new LegoVideoManager())) {
 		if (m_videoManager->Create(p_param.GetVideoParam(), 100, 0) != SUCCESS) {
 			delete m_videoManager;
 			m_videoManager = NULL;
 		}
 	}
 
-	if (m_inputMgr = new LegoInputManager()) {
+	if ((m_inputMgr = new LegoInputManager())) {
 		if (m_inputMgr->Create(p_param.GetWindowHandle()) != SUCCESS) {
 			delete m_inputMgr;
 			m_inputMgr = NULL;
diff --git a/LEGO1/mxdirectx/mxdirect3d.cpp b/LEGO1/mxdirectx/mxdirect3d.cpp
index a354feac..a224158b 100644
--- a/LEGO1/mxdirectx/mxdirect3d.cpp
+++ b/LEGO1/mxdirectx/mxdirect3d.cpp
@@ -747,7 +747,7 @@ int MxDeviceEnumerate::FUN_1009d0d0()
 			}
 
 			if ((und && (*it2).m_HELDesc.dcmColorModel == D3DCOLOR_RGB && i == 0) ||
-				(*it2).m_HELDesc.dcmColorModel == D3DCOLOR_MONO && i == 0 && k < 0) {
+				((*it2).m_HELDesc.dcmColorModel == D3DCOLOR_MONO && i == 0 && k < 0)) {
 				k = j;
 			}
 
diff --git a/LEGO1/omni/src/common/mxutil.cpp b/LEGO1/omni/src/common/mxutil.cpp
index e5cd2dab..5ffab77c 100644
--- a/LEGO1/omni/src/common/mxutil.cpp
+++ b/LEGO1/omni/src/common/mxutil.cpp
@@ -118,8 +118,8 @@ MxBool KeyValueStringParse(char* p_outputValue, const char* p_key, const char* p
 MxBool ContainsPresenter(MxCompositePresenterList& p_presenterList, MxPresenter* p_presenter)
 {
 	for (MxCompositePresenterList::iterator it = p_presenterList.begin(); it != p_presenterList.end(); it++) {
-		if (p_presenter == *it || (*it)->IsA("MxCompositePresenter") &&
-									  ContainsPresenter(((MxCompositePresenter*) *it)->GetList(), p_presenter)) {
+		if (p_presenter == *it || ((*it)->IsA("MxCompositePresenter") &&
+								   ContainsPresenter(((MxCompositePresenter*) *it)->GetList(), p_presenter))) {
 			return TRUE;
 		}
 	}
diff --git a/LEGO1/omni/src/main/mxomni.cpp b/LEGO1/omni/src/main/mxomni.cpp
index 5c73833d..c04425b1 100644
--- a/LEGO1/omni/src/main/mxomni.cpp
+++ b/LEGO1/omni/src/main/mxomni.cpp
@@ -190,7 +190,7 @@ MxResult MxOmni::Create(MxOmniCreateParam& p_param)
 	}
 
 	if (p_param.CreateFlags().CreateNotificationManager()) {
-		if (m_notificationManager = new MxNotificationManager()) {
+		if ((m_notificationManager = new MxNotificationManager())) {
 			if (m_notificationManager->Create(100, 0) != SUCCESS) {
 				goto done;
 			}
@@ -207,7 +207,7 @@ MxResult MxOmni::Create(MxOmniCreateParam& p_param)
 	}
 
 	if (p_param.CreateFlags().CreateVideoManager()) {
-		if (m_videoManager = new MxVideoManager()) {
+		if ((m_videoManager = new MxVideoManager())) {
 			if (m_videoManager->Create(p_param.GetVideoParam(), 100, 0) != SUCCESS) {
 				delete m_videoManager;
 				m_videoManager = NULL;
@@ -216,7 +216,7 @@ MxResult MxOmni::Create(MxOmniCreateParam& p_param)
 	}
 
 	if (p_param.CreateFlags().CreateSoundManager()) {
-		if (m_soundManager = new MxSoundManager()) {
+		if ((m_soundManager = new MxSoundManager())) {
 			if (m_soundManager->Create(10, 0) != SUCCESS) {
 				delete m_soundManager;
 				m_soundManager = NULL;
@@ -225,7 +225,7 @@ MxResult MxOmni::Create(MxOmniCreateParam& p_param)
 	}
 
 	if (p_param.CreateFlags().CreateMusicManager()) {
-		if (m_musicManager = new MxMusicManager()) {
+		if ((m_musicManager = new MxMusicManager())) {
 			if (m_musicManager->Create(50, 0) != SUCCESS) {
 				delete m_musicManager;
 				m_musicManager = NULL;
@@ -234,7 +234,7 @@ MxResult MxOmni::Create(MxOmniCreateParam& p_param)
 	}
 
 	if (p_param.CreateFlags().CreateEventManager()) {
-		if (m_eventManager = new MxEventManager()) {
+		if ((m_eventManager = new MxEventManager())) {
 			if (m_eventManager->Create(50, 0) != SUCCESS) {
 				delete m_eventManager;
 				m_eventManager = NULL;
@@ -243,6 +243,7 @@ MxResult MxOmni::Create(MxOmniCreateParam& p_param)
 	}
 
 	result = SUCCESS;
+
 done:
 	if (result != SUCCESS) {
 		Destroy();
diff --git a/LEGO1/omni/src/notify/mxnotificationmanager.cpp b/LEGO1/omni/src/notify/mxnotificationmanager.cpp
index 80a32236..fe10a82c 100644
--- a/LEGO1/omni/src/notify/mxnotificationmanager.cpp
+++ b/LEGO1/omni/src/notify/mxnotificationmanager.cpp
@@ -128,9 +128,9 @@ void MxNotificationManager::FlushPending(MxCore* p_listener)
 			MxNotificationPtrList::iterator it = m_sendList->begin();
 			while (it != m_sendList->end()) {
 				notif = *it;
-				if ((notif->GetTarget()->GetId() == p_listener->GetId()) ||
-					(notif->GetParam()->GetSender()) &&
-						(notif->GetParam()->GetSender()->GetId() == p_listener->GetId())) {
+				if (notif->GetTarget()->GetId() == p_listener->GetId() ||
+					(notif->GetParam()->GetSender() && notif->GetParam()->GetSender()->GetId() == p_listener->GetId()
+					)) {
 					m_sendList->erase(it++);
 					pending.push_back(notif);
 				}
@@ -143,8 +143,8 @@ void MxNotificationManager::FlushPending(MxCore* p_listener)
 		MxNotificationPtrList::iterator it = m_queue->begin();
 		while (it != m_queue->end()) {
 			notif = *it;
-			if ((notif->GetTarget()->GetId() == p_listener->GetId()) ||
-				(notif->GetParam()->GetSender()) && (notif->GetParam()->GetSender()->GetId() == p_listener->GetId())) {
+			if (notif->GetTarget()->GetId() == p_listener->GetId() ||
+				(notif->GetParam()->GetSender() && notif->GetParam()->GetSender()->GetId() == p_listener->GetId())) {
 				m_queue->erase(it++);
 				pending.push_back(notif);
 			}
diff --git a/LEGO1/omni/src/stream/mxdsbuffer.cpp b/LEGO1/omni/src/stream/mxdsbuffer.cpp
index 60b4542d..106964b2 100644
--- a/LEGO1/omni/src/stream/mxdsbuffer.cpp
+++ b/LEGO1/omni/src/stream/mxdsbuffer.cpp
@@ -169,7 +169,7 @@ MxResult MxDSBuffer::FUN_100c67b0(
 	}
 
 	MxU8* data;
-	while (data = (MxU8*) SkipToData()) {
+	while ((data = (MxU8*) SkipToData())) {
 		if (*p_streamingAction == NULL) {
 			result = CreateObject(p_controller, (MxU32*) data, p_action, p_streamingAction);
 
diff --git a/LEGO1/omni/src/system/mxsemaphore.cpp b/LEGO1/omni/src/system/mxsemaphore.cpp
index 50dc57f3..daba60f4 100644
--- a/LEGO1/omni/src/system/mxsemaphore.cpp
+++ b/LEGO1/omni/src/system/mxsemaphore.cpp
@@ -15,7 +15,7 @@ MxSemaphore::MxSemaphore()
 MxResult MxSemaphore::Init(MxU32 p_initialCount, MxU32 p_maxCount)
 {
 	MxResult result = FAILURE;
-	if (m_hSemaphore = CreateSemaphoreA(NULL, p_initialCount, p_maxCount, NULL)) {
+	if ((m_hSemaphore = CreateSemaphoreA(NULL, p_initialCount, p_maxCount, NULL))) {
 		result = SUCCESS;
 	}
 	return result;
diff --git a/LEGO1/omni/src/system/mxthread.cpp b/LEGO1/omni/src/system/mxthread.cpp
index bb5313d8..14c4ea82 100644
--- a/LEGO1/omni/src/system/mxthread.cpp
+++ b/LEGO1/omni/src/system/mxthread.cpp
@@ -63,8 +63,8 @@ MxResult MxThread::Start(MxS32 p_stack, MxS32 p_flag)
 {
 	MxResult result = FAILURE;
 	if (m_semaphore.Init(0, 1) == SUCCESS) {
-		if (m_hThread =
-				_beginthreadex(NULL, p_stack << 2, (ThreadFunc) &MxThread::ThreadProc, this, p_flag, &m_threadId)) {
+		if ((m_hThread =
+				 _beginthreadex(NULL, p_stack << 2, (ThreadFunc) &MxThread::ThreadProc, this, p_flag, &m_threadId))) {
 			result = SUCCESS;
 		}
 	}
diff --git a/LEGO1/omni/src/video/mxvideopresenter.cpp b/LEGO1/omni/src/video/mxvideopresenter.cpp
index 2658deb4..dcccf8f6 100644
--- a/LEGO1/omni/src/video/mxvideopresenter.cpp
+++ b/LEGO1/omni/src/video/mxvideopresenter.cpp
@@ -347,7 +347,7 @@ void MxVideoPresenter::PutFrame()
 		MxRegionCursor cursor(region);
 		MxRect32* regionRect;
 
-		while (regionRect = cursor.VTable0x24(rect)) {
+		while ((regionRect = cursor.VTable0x24(rect))) {
 			if (regionRect->GetWidth() >= 1 && regionRect->GetHeight() >= 1) {
 				if (m_unk0x58) {
 					rectSrc.SetLeft(regionRect->GetLeft() - m_location.GetX());