Index: trunk/FACT++/src/InterpreterV8.cc
===================================================================
--- trunk/FACT++/src/InterpreterV8.cc	(revision 18818)
+++ trunk/FACT++/src/InterpreterV8.cc	(revision 18820)
@@ -2183,5 +2183,5 @@
     const Time utc(v/1000, v%1000);
 
-    Nova::LnLatPosn obs = Nova::ORM();
+    Nova::LnLatPosn obs = Nova::kORM;
 
     ln_rst_time sun;
@@ -2195,5 +2195,5 @@
 {
     if (args.Length()>1)
-        return ThrowException(String::New("Moon.horizon must not be called with one argument."));
+        return ThrowException(String::New("Moon.horizon must not be called with more than one argument."));
 
     if (args.Length()==1 && !args[0]->IsDate())
@@ -2210,5 +2210,5 @@
     const Time utc(v/1000, v%1000);
 
-    Nova::LnLatPosn obs = Nova::ORM();
+    Nova::LnLatPosn obs = Nova::kORM;
 
     ln_rst_time moon;
Index: trunk/FACT++/src/Time.cc
===================================================================
--- trunk/FACT++/src/Time.cc	(revision 18818)
+++ trunk/FACT++/src/Time.cc	(revision 18820)
@@ -314,5 +314,5 @@
 {
 #ifdef HAVE_LIBNOVA
-    Nova::LnLatPosn obs = Nova::ORM();
+    Nova::LnLatPosn obs = Nova::kORM;
 
     ln_rst_time sun_day;
@@ -347,5 +347,5 @@
 {
 #ifdef HAVE_LIBNOVA
-    Nova::LnLatPosn obs = Nova::ORM();
+    Nova::LnLatPosn obs = Nova::kORM;
 
     ln_rst_time sun_day;
Index: trunk/FACT++/src/drivectrl.cc
===================================================================
--- trunk/FACT++/src/drivectrl.cc	(revision 18818)
+++ trunk/FACT++/src/drivectrl.cc	(revision 18820)
@@ -368,6 +368,6 @@
         out.mjd = _mjd;
 
-        const double elong  = Nova::ORM().lng * M_PI/180;
-        const double lat    = Nova::ORM().lat * M_PI/180;
+        const double elong  = Nova::kORM.lng * M_PI/180;
+        const double lat    = Nova::kORM.lat * M_PI/180;
         const double height = 2200;
 
@@ -2373,5 +2373,5 @@
             fTrackingCounter = 0;
 
-        const double ha = fmod(fDrive.GetSeTime(),1)*24 - Nova::ORM().lng/15;
+        const double ha = fmod(fDrive.GetSeTime(),1)*24 - Nova::kORM.lng/15;
 
         array<double, 12> dim;