diff --git a/src/celengine/parseobject.cpp b/src/celengine/parseobject.cpp
index 59c9d1fd8b..5de31e8c0c 100644
--- a/src/celengine/parseobject.cpp
+++ b/src/celengine/parseobject.cpp
@@ -827,11 +827,7 @@ CreateOrbit(const Selection& centralObject,
         Body* centralBody = centralObject.body();
         if (centralBody != nullptr)
         {
-#if 0 // TODO: This should be enabled after #542 is fixed
             Vector3d pos = centralBody->geodeticToCartesian(*longlat);
-#else
-            Vector3d pos = centralBody->planetocentricToCartesian(longlat->x(), longlat->y(), longlat->z());
-#endif
             return new celestia::ephem::SynchronousOrbit(*centralBody, pos);
         }
         // TODO: Allow fixing objects to the surface of stars.
diff --git a/src/celengine/render.cpp b/src/celengine/render.cpp
index 35ac294e1a..44f6aa698a 100644
--- a/src/celengine/render.cpp
+++ b/src/celengine/render.cpp
@@ -4888,7 +4888,7 @@ Renderer::removeInvisibleItems(const math::Frustum &frustum)
             nearZ = -nearZ * nearZcoeff;
 
             if (nearZ > -MinNearPlaneDistance)
-                ri.nearZ = -max(MinNearPlaneDistance, radius / 2000.0f);
+                ri.nearZ = -std::min(MinNearPlaneDistance, radius / 2000.0f);
             else
                 ri.nearZ = nearZ;