diff --git a/Engine/source/T3D/gameBase/gameBase.cpp b/Engine/source/T3D/gameBase/gameBase.cpp
index ee4d478f1f..ed00a881b6 100644
--- a/Engine/source/T3D/gameBase/gameBase.cpp
+++ b/Engine/source/T3D/gameBase/gameBase.cpp
@@ -666,7 +666,8 @@ void GameBase::onMount( SceneObject *obj, S32 node )
 
    if (!isGhost()) {
       setMaskBits(MountedMask);
-      mDataBlock->onMount_callback( this, obj, node );
+      if (mDataBlock)
+         mDataBlock->onMount_callback( this, obj, node );
    }
 }
 
@@ -681,7 +682,8 @@ void GameBase::onUnmount( SceneObject *obj, S32 node )
 
    if (!isGhost()) {
       setMaskBits(MountedMask);
-      mDataBlock->onUnmount_callback( this, obj, node );
+      if (mDataBlock)
+         mDataBlock->onUnmount_callback( this, obj, node );
    }
 }
 
diff --git a/Engine/source/scene/sceneObject.cpp b/Engine/source/scene/sceneObject.cpp
index b73326ae50..641349225c 100644
--- a/Engine/source/scene/sceneObject.cpp
+++ b/Engine/source/scene/sceneObject.cpp
@@ -1220,7 +1220,7 @@ void SceneObject::resolveMountPID()
    if ( mMountPID  )
    {
       SceneObject *obj = dynamic_cast< SceneObject* >( mMountPID->getObject() );
-      if ( obj != mMount.object)
+      if (obj && obj != mMount.object)
          obj->mountObject( this, mMount.node, mMount.xfm );
    }
 }
@@ -1678,15 +1678,7 @@ void SceneObject::PerformUpdatesForChildren(MatrixF mat){
 // parent have moved
 void SceneObject::updateChildTransform(){
 	if (getParent() != NULL){
-		MatrixF one;
-		MatrixF two;
-		MatrixF three;
-		MatrixF four;
 		MatrixF mat;
-		one= getTransform();
-		two = getParent()->getTransform();
-		one.affineInverse();
-		four.mul(two,one);
 		mat.mul(getParent()->mLastXform,getTransform());
 		setTransform(mat);
 	}
diff --git a/Engine/source/sim/netObject.h b/Engine/source/sim/netObject.h
index 0bed126127..aea3769e58 100644
--- a/Engine/source/sim/netObject.h
+++ b/Engine/source/sim/netObject.h
@@ -411,9 +411,11 @@ class NetObject : public SimGroup
 
    /// @}
 protected:
+#ifdef TORQUE_AFX_ENABLED
    U16           mScope_id;
    U16           mScope_refs;
    bool          mScope_registered;
+#endif
    virtual void  onScopeIdChange() { }
 public:
    enum { SCOPE_ID_BITS = 14 };