diff --git a/src/parameterFactory.hpp b/src/parameterFactory.hpp
index 3e58ff3f..6a634717 100644
--- a/src/parameterFactory.hpp
+++ b/src/parameterFactory.hpp
@@ -44,6 +44,8 @@ protected:
 
 	NameMap m_nameMap;
 
+public:
+
 	template <class TYPE>
 	class registerer
 	{
@@ -56,7 +58,6 @@ protected:
 		}
 	};
 
-public:
 
 	template <class T>
 	void registerName(const string& name)
diff --git a/src/propertySet.hpp b/src/propertySet.hpp
index 6cffa3ed..569c994d 100644
--- a/src/propertySet.hpp
+++ b/src/propertySet.hpp
@@ -202,7 +202,8 @@ public:
 		const property* const prop = find(name);
 		if (!prop) throw exceptions::no_such_property(name);
 
-		return (prop->getValue <TYPE>());
+		//return (prop->getValue <TYPE>());  // BUG: with g++ < 3.4
+		return (prop->template getValue <TYPE>());
 	}
 
 	/** Get the value of the specified property.
@@ -218,7 +219,8 @@ public:
 	const TYPE getProperty(const string& name, const TYPE defaultValue) const
 	{
 		const property* const prop = find(name);
-		return (prop ? prop->getValue <TYPE>() : defaultValue);
+		//return (prop ? prop->getValue <TYPE>() : defaultValue); // BUG: with g++ < 3.4
+		return (prop ? prop->template getValue <TYPE>() : defaultValue);
 	}
 
 	/** Change the value of the specified property or create