diff --git a/Sources/Tools/MaxComponent/CMakeLists.txt b/Sources/Tools/MaxComponent/CMakeLists.txt
index c78b1a68..670cc548 100644
--- a/Sources/Tools/MaxComponent/CMakeLists.txt
+++ b/Sources/Tools/MaxComponent/CMakeLists.txt
@@ -192,7 +192,7 @@ add_library(MaxComponent
             ${MaxComponent_SOURCES}
 )
 
-source_group("Header Files" FILES ${MaxComponents_HEADERS})
-source_group("Resource Files" FILES ${MaxComponents_RESOURCES})
-source_group("Source Files" FILES ${MaxComponents_SOURCES})
+source_group("Header Files" FILES ${MaxComponent_HEADERS})
+source_group("Resource Files" FILES ${MaxComponent_RESOURCES})
+source_group("Source Files" FILES ${MaxComponent_SOURCES})
 
diff --git a/Sources/Tools/MaxComponent/pfGUISkinComp.cpp b/Sources/Tools/MaxComponent/pfGUISkinComp.cpp
index 1a2d1a57..afe1e0b1 100644
--- a/Sources/Tools/MaxComponent/pfGUISkinComp.cpp
+++ b/Sources/Tools/MaxComponent/pfGUISkinComp.cpp
@@ -173,7 +173,7 @@ void    pfGUISkinEditProc::IRefreshImageBuffer( void )
         bi.SetHeight( fDblHeight );
         newBM = TheManager->Create( &bi );
 
-        BMM_Color_64 foo = { 0, 0, 0, 0 };
+        BMM_Color_64 foo(0, 0, 0, 0 );
         newBM->CopyImage( pbBMap->bm, COPY_IMAGE_RESIZE_LO_QUALITY, foo, nil );
 
         // Now copy from our newly created bitmap into our DC....way slow :(
diff --git a/Sources/Tools/MaxComponent/plAutoUIParams.cpp b/Sources/Tools/MaxComponent/plAutoUIParams.cpp
index 46f1f298..6d24235a 100644
--- a/Sources/Tools/MaxComponent/plAutoUIParams.cpp
+++ b/Sources/Tools/MaxComponent/plAutoUIParams.cpp
@@ -1728,7 +1728,7 @@ void plDropDownListParam::IUpdateList(IParamBlock2 *pb)
     
     if (pb)
     {
-        char* bob = pb->GetStr(fID);
+        const char* bob = pb->GetStr(fID);
         if (bob)
             val = bob;
     }
diff --git a/Sources/Tools/MaxComponent/plCameraComponent.cpp b/Sources/Tools/MaxComponent/plCameraComponent.cpp
index 78b2ecfa..a4d6e857 100644
--- a/Sources/Tools/MaxComponent/plCameraComponent.cpp
+++ b/Sources/Tools/MaxComponent/plCameraComponent.cpp
@@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "MaxConvert/plConvert.h"
 
 #include "MaxMain/plPhysicalProps.h"
-#include "plHavok1/plHKPhysicsGroups.h"
+//#include "plHavok1/plHKPhysicsGroups.h"
 
 void DummyCodeIncludeFuncCamera() {}
 
diff --git a/Sources/Tools/MaxComponent/plPythonFileComponent.cpp b/Sources/Tools/MaxComponent/plPythonFileComponent.cpp
index 1320d64b..a80920df 100644
--- a/Sources/Tools/MaxComponent/plPythonFileComponent.cpp
+++ b/Sources/Tools/MaxComponent/plPythonFileComponent.cpp
@@ -1042,7 +1042,7 @@ static BOOL CALLBACK WarnDialogProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM l
         ErrorSet::iterator it = badNodes->begin();
         for (; it != badNodes->end(); it++)
         {
-            plPythonError& err = *it;
+            const plPythonError err = *it;
 
             plMaxNode* node = err.node;
             plPythonFileComponent* comp = (plPythonFileComponent*)node->ConvertToComponent();
@@ -1093,7 +1093,7 @@ static void WriteBadPythonText(ErrorSet& badNodes)
     ErrorSet::iterator it = badNodes.begin();
     for (; it != badNodes.end(); it++)
     {
-        plPythonError& err = *it;
+        const plPythonError err = *it;
 
         const char* compName = err.node->GetName();
         const char* pythonFile = err.pythonName;
diff --git a/Sources/Tools/MaxComponent/plResponderLink.cpp b/Sources/Tools/MaxComponent/plResponderLink.cpp
index 976c3c07..10870484 100644
--- a/Sources/Tools/MaxComponent/plResponderLink.cpp
+++ b/Sources/Tools/MaxComponent/plResponderLink.cpp
@@ -135,7 +135,7 @@ const char *plResponderCmdLink::GetInstanceName(IParamBlock2 *pb)
 
 void plResponderCmdLink::SetupProperties(plMaxNode* node, plErrorMsg* pErrMsg, IParamBlock2* pb)
 {
-    char * spawnPtName = pb->GetStr( kLinkAgeSpawnPointName );
+    const char * spawnPtName = pb->GetStr( kLinkAgeSpawnPointName );
     if ( !spawnPtName )
     {
         // set defaults
@@ -144,7 +144,7 @@ void plResponderCmdLink::SetupProperties(plMaxNode* node, plErrorMsg* pErrMsg, I
     }
     else
     {
-        char * spawnPtTitle = pb->GetStr( kLinkAgeSpawnPointTitle );
+        const char * spawnPtTitle = pb->GetStr( kLinkAgeSpawnPointTitle );
         if ( !spawnPtTitle )
         {
             // set default title, or make same as name.
diff --git a/Sources/Tools/MaxComponent/plResponderWait.cpp b/Sources/Tools/MaxComponent/plResponderWait.cpp
index 372d6543..6ff7aa24 100644
--- a/Sources/Tools/MaxComponent/plResponderWait.cpp
+++ b/Sources/Tools/MaxComponent/plResponderWait.cpp
@@ -81,7 +81,7 @@ void ResponderWait::FixupWaitBlock(IParamBlock2 *waitPB)
 
     if (waitPB->Count(kWaitPointOld) > 0)
     {
-        TCHAR* point = waitPB->GetStr(kWaitPointOld, 0, 0);
+        const char* point = waitPB->GetStr(kWaitPointOld, 0, 0);
         waitPB->SetValue(kWaitPoint, 0, point);
         waitPB->Delete(kWaitPointOld, 0, 1);
     }
diff --git a/Sources/Tools/MaxComponent/plWaterComponent.cpp b/Sources/Tools/MaxComponent/plWaterComponent.cpp
index fec9834a..be762de3 100644
--- a/Sources/Tools/MaxComponent/plWaterComponent.cpp
+++ b/Sources/Tools/MaxComponent/plWaterComponent.cpp
@@ -1323,7 +1323,7 @@ plRenderTarget* plEnvMapComponent::IGetMap()
         int numVisNames = fCompPB->Count(kVisSetNames);
         for( i = 0; i < numVisNames; i++)
         {
-            fMap->SetVisRegionName(fCompPB->GetStr(kVisSetNames, 0, i));
+            fMap->SetVisRegionName((char*)fCompPB->GetStr(kVisSetNames, 0, i));
         }
 
         if (visGot)
diff --git a/Sources/Tools/MaxComponent/resource.h b/Sources/Tools/MaxComponent/resource.h
index f6f51f82..ba5c6e8b 100644
--- a/Sources/Tools/MaxComponent/resource.h
+++ b/Sources/Tools/MaxComponent/resource.h
@@ -1891,3 +1891,8 @@
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif
+
+// Hack -- don't ask.
+#if(WINVER < 0x0500)
+#define IDC_HAND IDC_CROSS
+#endif
\ No newline at end of file
diff --git a/Sources/Tools/MaxConvert/hsConverterUtils.cpp b/Sources/Tools/MaxConvert/hsConverterUtils.cpp
index 647e4815..e643cb72 100644
--- a/Sources/Tools/MaxConvert/hsConverterUtils.cpp
+++ b/Sources/Tools/MaxConvert/hsConverterUtils.cpp
@@ -419,7 +419,7 @@ hsBool hsConverterUtils::IsInstanced(Object* maxObject)
     }
 
     ObjectInstancedEnumProc instProc;
-    maxObject->EnumDependents(&instProc);
+    maxObject->DoEnumDependents(&instProc);
 
     return (instProc.GetInstanceCount() > 1);
     hsGuardEnd; 
diff --git a/Sources/Tools/MaxConvert/hsMaterialConverter.cpp b/Sources/Tools/MaxConvert/hsMaterialConverter.cpp
index 35c0ea4a..ba9fdfd7 100644
--- a/Sources/Tools/MaxConvert/hsMaterialConverter.cpp
+++ b/Sources/Tools/MaxConvert/hsMaterialConverter.cpp
@@ -3932,7 +3932,7 @@ hsBool hsMaterialConverter::IClearDoneMaterial(Mtl* mtl, plMaxNode* node)
 #define VIEW_BK 5
 
 
-static BMM_Color_64 green64 = {0,(1<<16)-1,0,(1<<16)-1};
+static BMM_Color_64 green64 = BMM_Color_64(0, (1<<16)-1, 0, (1<<16)-1);
 
 BMM_Color_64 hsMaterialConverter::ICubeSample(Bitmap *bitmap[6], double phi, double theta) 
 {
@@ -4466,18 +4466,22 @@ static void GetMtlNodes(Mtl *mtl, INodeTab& nodes)
     if (!mtl)
         return;
 
-    RefList& refs = mtl->GetRefList();
-    RefListItem *item = refs.FirstItem();
-    while (item)
+    DependentIterator di(mtl);
+    ReferenceMaker *rm = di.Next();
+    while (rm != nil)
     {
-        if (item->maker->SuperClassID() == BASENODE_CLASS_ID)
+        for (int i = 0; i < rm->NumRefs(); i++)
         {
-            INode *node = (INode*)item->maker;
-            if (node->GetMtl() == mtl)
-                nodes.Append(1, &node);
+            RefTargetHandle item = rm->GetReference(i);
+            if (item->SuperClassID() == BASENODE_CLASS_ID)
+            {
+                INode *node = (INode*)item;
+                if (node->GetMtl() == mtl)
+                    nodes.Append(1, &node);
+            }
         }
 
-        item = item->next;
+        rm = di.Next();
     }
 }