diff --git a/adm/upgrade.tcl b/adm/upgrade.tcl
index dd314b011c..2d19fa8c88 100644
--- a/adm/upgrade.tcl
+++ b/adm/upgrade.tcl
@@ -484,7 +484,7 @@ proc ConvertTColFwd {thePackagePath theHeaderExtensions} {
 proc DefineExplicitRtti {hxxfile class base theSourceExtensions} {
   # if current file is not a header (by extension), exit with "inline" variant
   # (there is no need to bother with out-of-line instantiations for local class)
-  set ext [file extension $hxxfile]
+  set ext [string range [file extension $hxxfile] 1 end]
   if { [lsearch -exact [split $theSourceExtensions ,] $ext] >=0 } {
     return "_INLINE"
   }
@@ -518,13 +518,19 @@ proc DefineExplicitRtti {hxxfile class base theSourceExtensions} {
     # non-preprocessor line
     set aNewFileContent {}
     set injected 0
+    set inc_found 0
     foreach line $aFileContent {
-      if { ! $injected && ! [regexp {^\s*//} $line] &&
-           ! [regexp {^\s*$} $line] && ! [regexp {^\s*\#\s*include} $line] } {
-        set injected 1
-        lappend aNewFileContent "IMPLEMENT_STANDARD_RTTIEXT($class,$base)"
-        if { ! [regexp "^IMPLEMENT_" $line] } {
-          lappend aNewFileContent ""
+      if { ! $injected } {
+        # add macro before first non-empty line after #includes
+        if { [regexp {^\s*$} $line] } {
+        } elseif { [regexp {^\s*\#\s*include} $line] } {
+          set inc_found 1
+        } elseif { $inc_found } {
+          set injected 1
+          lappend aNewFileContent "IMPLEMENT_STANDARD_RTTIEXT($class,$base)"
+          if { ! [regexp "^IMPLEMENT_" $line] } {
+            lappend aNewFileContent ""
+          }
         }
       }
       lappend aNewFileContent $line
diff --git a/src/PrsMgr/PrsMgr_PresentationManager3d.hxx b/src/PrsMgr/PrsMgr_PresentationManager3d.hxx
index 72403f7d93..ad7b5b76f0 100644
--- a/src/PrsMgr/PrsMgr_PresentationManager3d.hxx
+++ b/src/PrsMgr/PrsMgr_PresentationManager3d.hxx
@@ -20,6 +20,5 @@
 #include <PrsMgr_PresentationManager.hxx>
 
 typedef PrsMgr_PresentationManager PrsMgr_PresentationManager3d;
-typedef Handle_PrsMgr_PresentationManager Handle_PrsMgr_PresentationManager3d;
 
 #endif // _PrsMgr_PresentationManager3d_HeaderFile
diff --git a/src/StepDimTol/StepDimTol_RunoutZoneDefinition.hxx b/src/StepDimTol/StepDimTol_RunoutZoneDefinition.hxx
index 4587d73474..67e5de6c51 100644
--- a/src/StepDimTol/StepDimTol_RunoutZoneDefinition.hxx
+++ b/src/StepDimTol/StepDimTol_RunoutZoneDefinition.hxx
@@ -27,6 +27,7 @@ class StepRepr_HArray1OfShapeAspect;
 
 class StepDimTol_RunoutZoneDefinition;
 DEFINE_STANDARD_HANDLE(StepDimTol_RunoutZoneDefinition, StepDimTol_ToleranceZoneDefinition)
+
 //! Representation of STEP entity ToleranceZoneDefinition
 class StepDimTol_RunoutZoneDefinition : public StepDimTol_ToleranceZoneDefinition
 {
@@ -53,7 +54,7 @@ public:
     myOrientation = theOrientation;
   }
   
-  DEFINE_STANDARD_RTTI(StepDimTol_ToleranceZoneDefinition, StepDimTol_ToleranceZoneDefinition)
+  DEFINE_STANDARD_RTTI(StepDimTol_RunoutZoneDefinition,StepDimTol_ToleranceZoneDefinition)
 
 private: 
   Handle(StepDimTol_RunoutZoneOrientation) myOrientation;