diff --git a/src/geo/pigeoposition.h b/src/geo/pigeoposition.h
index b5ab200c..4b618975 100644
--- a/src/geo/pigeoposition.h
+++ b/src/geo/pigeoposition.h
@@ -138,6 +138,9 @@ public:
 	/// Computes the radius of curvature in the prime vertical (Rn) corresponding to this PIGeoPosition.
 	double getCurvPrimeVertical() const;
 
+	/// Returns as PIMathVectorT3d
+	const PIMathVectorT3d & vector() const {return *this;}
+
 //	PIGeoPosition &operator=(const PIGeoPosition & v);
 	PIGeoPosition &operator=(const PIMathVectorT3d & v);
 	PIGeoPosition &operator-=(const PIGeoPosition &right);
diff --git a/utils/code_model_generator/main.cpp b/utils/code_model_generator/main.cpp
index 64138050..6d765d61 100755
--- a/utils/code_model_generator/main.cpp
+++ b/utils/code_model_generator/main.cpp
@@ -172,7 +172,7 @@ void writeModel(PICodeParser & parser, const PIString out, bool only_enums) {
 				entry << "}\n";
 			}
 			if (efunc) continue;
-			f << entry << "\tPICout(AddNewLine) << \"Can`t find function \\\"\" << function << \"\\\" in "
+			f << entry << "\tPICout(PICoutManipulators::AddNewLine) << \"Can`t find function \\\"\" << function << \"\\\" in "
 			<< e->type << " \\\"" << e->name << "\\\"!\";\n\treturn PIVariant();\n}\n";
 			ventities << e;
 		}