diff --git a/code/irrXML/CXMLReaderImpl.h b/code/irrXML/CXMLReaderImpl.h
index de5ba59f0..d9b1eaaed 100644
--- a/code/irrXML/CXMLReaderImpl.h
+++ b/code/irrXML/CXMLReaderImpl.h
@@ -663,7 +663,7 @@ private:
 			// MSVC debugger complains here about loss of data ...
 			// todo ... I temporarily disabled the check in the build config
 			for (int i=0; i<sizeWithoutHeader; ++i)
-				TextData[i] = (char_type)source[i];
+				TextData[i] = char_type( source[i] & ((1u << (sizeof( char_type)*8)) - 1));
 
 			TextBegin = TextData;
 			TextSize = sizeWithoutHeader;
diff --git a/tools/assimp_view/AnimEvaluator.cpp b/tools/assimp_view/AnimEvaluator.cpp
index e81fce433..965e7480e 100644
--- a/tools/assimp_view/AnimEvaluator.cpp
+++ b/tools/assimp_view/AnimEvaluator.cpp
@@ -77,7 +77,7 @@ void AnimEvaluator::Evaluate( double pTime)
 
 		// ******** Position *****
 		aiVector3D presentPosition( 0, 0, 0);
-		if( channel->mPositionKeys > 0)
+		if( channel->mNumPositionKeys > 0)
 		{
 			// Look for present frame number. Search from last position if time is after the last time, else from beginning
 			// Should be much quicker than always looking from start for the average use case.
@@ -96,7 +96,7 @@ void AnimEvaluator::Evaluate( double pTime)
 
 		// ******** Rotation *********
 		aiQuaternion presentRotation( 1, 0, 0, 0);
-		if( channel->mRotationKeys > 0)
+		if( channel->mNumRotationKeys > 0)
 		{
 			unsigned int frame = (time >= mLastTime) ? mLastPositions[a].get<1>() : 0;
 			while( frame < channel->mNumRotationKeys - 1)
@@ -113,7 +113,7 @@ void AnimEvaluator::Evaluate( double pTime)
 
 		// ******** Scaling **********
 		aiVector3D presentScaling( 0, 0, 0);
-		if( channel->mScalingKeys > 0)
+		if( channel->mNumScalingKeys > 0)
 		{
 			unsigned int frame = (time >= mLastTime) ? mLastPositions[a].get<2>() : 0;
 			while( frame < channel->mNumScalingKeys - 1)
diff --git a/tools/assimp_view/Display.cpp b/tools/assimp_view/Display.cpp
index c3e56e3b3..e63053def 100644
--- a/tools/assimp_view/Display.cpp
+++ b/tools/assimp_view/Display.cpp
@@ -1991,7 +1991,7 @@ int CDisplay::RenderNode (aiNode* piNode,const aiMatrix4x4& piMatrix,
 					*tempmat++ = mat.d1; *tempmat++ = mat.d2; *tempmat++ = mat.d3; *tempmat++ = mat.d4; 
 					//tempmat += 4;
 				}
-				helper->piEffect->SetMatrixTransposeArray( "gBoneMatrix", (D3DXMATRIX*)matrices, 60);
+				helper->piEffect->SetMatrixArray( "gBoneMatrix", (D3DXMATRIX*)matrices, 60);
 			}
 
 			// now setup the material
diff --git a/tools/assimp_view/SceneAnimator.cpp b/tools/assimp_view/SceneAnimator.cpp
index a1bed3d88..10de3afef 100644
--- a/tools/assimp_view/SceneAnimator.cpp
+++ b/tools/assimp_view/SceneAnimator.cpp
@@ -224,7 +224,7 @@ void SceneAnimator::CalculateGlobalTransform( SceneAnimNode* pInternalNode)
 	SceneAnimNode* node = pInternalNode->mParent;
 	while( node)
 	{
-		pInternalNode->mGlobalTransform = pInternalNode->mGlobalTransform * node->mLocalTransform;
+		pInternalNode->mGlobalTransform *= node->mLocalTransform;
 		node = node->mParent;
 	}
 }
diff --git a/workspaces/vc9_ATMNotUpToDate/assimp.suo b/workspaces/vc9_ATMNotUpToDate/assimp.suo
deleted file mode 100644
index 60d5e4c18..000000000
Binary files a/workspaces/vc9_ATMNotUpToDate/assimp.suo and /dev/null differ