Index: /trunk/MagicSoft/Mars/mbase/MParEmulated.cc
===================================================================
--- /trunk/MagicSoft/Mars/mbase/MParEmulated.cc	(revision 9042)
+++ /trunk/MagicSoft/Mars/mbase/MParEmulated.cc	(revision 9043)
@@ -38,7 +38,11 @@
 #include "MParEmulated.h"
 
+#include <TClass.h>   // root >=5.20/00
 #include <TPRegexp.h>
 #include <TMethodCall.h>
 #include <TStreamerElement.h>
+#if ROOT_VERSION_CODE>ROOT_VERSION(5,12,00)
+#include <TVirtualStreamerInfo.h>
+#endif
 
 #include "MLog.h"
@@ -80,5 +84,9 @@
 // Get the class with name clsname and its corresponding streamer info
 //
+#if ROOT_VERSION_CODE<ROOT_VERSION(5,18,00)
 TStreamerInfo *MParEmulated::GetStreamerInfo(const TString &clsname) const
+#else
+TVirtualStreamerInfo *MParEmulated::GetStreamerInfo(const TString &clsname) const
+#endif
 {
     TClass *cls = gROOT->GetClass(clsname);
@@ -89,5 +97,9 @@
     }
 
+#if ROOT_VERSION_CODE<ROOT_VERSION(5,18,00)
     TStreamerInfo *info = cls->GetStreamerInfo();
+#else
+    TVirtualStreamerInfo *info = cls->GetStreamerInfo();
+#endif
     if (!info)
     {
@@ -118,5 +130,9 @@
 TMethodCall *MParEmulated::GetterMethod(const char *name, TString clsname, Int_t offset) const
 {
+#if ROOT_VERSION_CODE<ROOT_VERSION(5,18,00)
     TStreamerInfo *info = GetStreamerInfo(clsname);
+#else
+    TVirtualStreamerInfo *info = GetStreamerInfo(clsname);
+#endif
     if (!info)
         return 0;
@@ -160,5 +176,9 @@
 void MParEmulated::Print(TPRegexp &regex, TString clsname, TString prefix, Int_t offset) const
 {
+#if ROOT_VERSION_CODE<ROOT_VERSION(5,18,00)
     TStreamerInfo *info = GetStreamerInfo(clsname);
+#else
+    TVirtualStreamerInfo *info = GetStreamerInfo(clsname);
+#endif
     if (!info)
         return;
Index: /trunk/MagicSoft/Mars/mbase/MParEmulated.h
===================================================================
--- /trunk/MagicSoft/Mars/mbase/MParEmulated.h	(revision 9042)
+++ /trunk/MagicSoft/Mars/mbase/MParEmulated.h	(revision 9043)
@@ -12,6 +12,12 @@
     TString fClassName;
 
-    TStreamerInfo *GetStreamerInfo(const TString &cls) const;
-    TMethodCall   *GetMethodCall(const char *get, Int_t offset) const;
+#ifndef __CINT__
+#if ROOT_VERSION_CODE<ROOT_VERSION(5,18,00)
+    TStreamerInfo *GetStreamerInfo(const TString &clsname) const;
+#else
+    TVirtualStreamerInfo *GetStreamerInfo(const TString &clsname) const;
+#endif
+#endif
+    TMethodCall *GetMethodCall(const char *get, Int_t offset) const;
 
 public:
Index: /trunk/MagicSoft/Mars/mbase/MStatusDisplay.cc
===================================================================
--- /trunk/MagicSoft/Mars/mbase/MStatusDisplay.cc	(revision 9042)
+++ /trunk/MagicSoft/Mars/mbase/MStatusDisplay.cc	(revision 9043)
@@ -2694,4 +2694,5 @@
         // deletion
         //
+
         //const Bool_t store = c->IsBatch();
         //c->SetBatch(kTRUE);
@@ -2700,13 +2701,19 @@
 
         //
-        // Use the canvas as coordinate system for the overlaying text
+        // Change/fix the canvas coordinate system for the overlaying text.
+        // This is necessary because root clip everything away which is
+        // outside a predefined area, which is (0,0)/(1,1)
         //
-        const Double_t height = 0.015;
-
-        const Double_t off = 0.005;
+        const Double_t height = 0.015;  // Text height
+        const Double_t off    = 0.005;  // Line offset from Text
+
         const Double_t bot = height+off;
         const Double_t top = 1-bot;
 
         static_cast<MyCanvas*>(c)->Scale(bot);
+
+        // If gPad is not set to c all follwing commands will
+        // get the wrong numbers for alignment
+        gPad = c;
 
         // Separator Lines
Index: /trunk/MagicSoft/Mars/merpp.cc
===================================================================
--- /trunk/MagicSoft/Mars/merpp.cc	(revision 9042)
+++ /trunk/MagicSoft/Mars/merpp.cc	(revision 9043)
@@ -1,3 +1,4 @@
 #include <TObjectTable.h>
+#include <TClass.h>
 
 #include "MArgs.h"