diff --git a/Extras/MayaPlugin/CMakeLists.txt b/Extras/MayaPlugin/CMakeLists.txt
index d05a069d1..f2eee2239 100644
--- a/Extras/MayaPlugin/CMakeLists.txt
+++ b/Extras/MayaPlugin/CMakeLists.txt
@@ -10,8 +10,12 @@ endif(COMMAND cmake_policy)
 SET(CMAKE_CXX_WARNING_LEVEL 4)
 
 #SET (CMAKE_VERBOSE_MAKEFILE TRUE)
-FIND_PATH(MAYA_BASE_DIR include/maya/MFn.h PATH /usr/autodesk/maya2008-x64 
-			/usr/autodesk/maya "C:/Program Files/Autodesk/Maya2008" "C:/Program Files/Autodesk/Maya2009")
+FIND_PATH(MAYA_BASE_DIR include/maya/MFn.h PATH 
+			/usr/autodesk/maya2008-x64 
+			/usr/autodesk/maya 
+			"C:/Program Files/Autodesk/Maya2008" 
+			"C:/Program Files/Autodesk/Maya2009" 
+			"C:/Program Files/Autodesk/Maya8.5")
 
 SET(MAYA_INC_DIR ${MAYA_BASE_DIR}/include)
 SET(MAYA_LIB_DIR ${MAYA_BASE_DIR}/lib)
diff --git a/Extras/MayaPlugin/pluginMain.cpp b/Extras/MayaPlugin/pluginMain.cpp
index 1cf287db1..1f4a2dc1b 100644
--- a/Extras/MayaPlugin/pluginMain.cpp
+++ b/Extras/MayaPlugin/pluginMain.cpp
@@ -195,6 +195,10 @@ MStatus uninitializePlugin( MObject obj )
     status = plugin.deregisterCommand(dSliderConstraintCmd::typeName);
     MCHECKSTATUS(status, "deregistering dSliderConstraintCmd")
 
+    status = plugin.deregisterCommand(dSixdofConstraintCmd::typeName);
+    MCHECKSTATUS(status, "deregistering dSixdofConstraintCmd")
+
+
 	status = plugin.deregisterCommand(dRigidBodyArrayCmd::typeName);
     MCHECKSTATUS(status, "deregistering dRigidBodyArrayCmd")
 
@@ -202,10 +206,8 @@ MStatus uninitializePlugin( MObject obj )
     MCHECKSTATUS(status, "deregistering dRigidBodyCmd")
 
     status = plugin.deregisterCommand(dSolverCmd::typeName);
-    MCHECKSTATUS(status, "deregistering dSolverGlobalsCmd")
+    MCHECKSTATUS(status, "deregistering dSolverCmd")
 
-    status = plugin.deregisterNode(dSolverNode::typeId);
-    MCHECKSTATUS(status, "deregistering dSolverNode")
 
     status = plugin.deregisterNode(nailConstraintNode::typeId);
     MCHECKSTATUS(status, "deregistering nailConstraintNode")
@@ -228,6 +230,9 @@ MStatus uninitializePlugin( MObject obj )
     status = plugin.deregisterNode(rigidBodyNode::typeId);
     MCHECKSTATUS(status, "deregistering rigidBodyNode")
 
+	status = plugin.deregisterNode(dSolverNode::typeId);
+    MCHECKSTATUS(status, "deregistering dSolverNode")
+
     status =  plugin.deregisterFileTranslator( "Bullet Physics export" );
     MCHECKSTATUS(status,"deregistering Bullet Physics export" )