diff --git a/code/ryzom/common/src/game_share/txt_command.h b/code/ryzom/common/src/game_share/txt_command.h
index f8d2ec39e..054f1bc93 100644
--- a/code/ryzom/common/src/game_share/txt_command.h
+++ b/code/ryzom/common/src/game_share/txt_command.h
@@ -50,21 +50,21 @@ static CTxtCommandSetPtr<__CTxtCommandSet_##setName> setName;
 //-------------------------------------------------------------------------------------------------
 
 #define TXT_COMMAND(cmdName,setName,CONTEXT_CLASS)\
-struct __CTxtCommand_##cmdName: public ITxtCommand<CONTEXT_CLASS>\
+struct __CTxtCommand_##cmdName##CONTEXT_CLASS: public ITxtCommand<CONTEXT_CLASS>\
 {\
-	static __CTxtCommand_##cmdName* getInstance()\
+	static __CTxtCommand_##cmdName##CONTEXT_CLASS* getInstance()\
 	{\
-		static __CTxtCommand_##cmdName *p=NULL;\
-		if (p==NULL) p= new __CTxtCommand_##cmdName;\
+		static __CTxtCommand_##cmdName##CONTEXT_CLASS *p=NULL;\
+		if (p==NULL) p= new __CTxtCommand_##cmdName##CONTEXT_CLASS;\
 		return p;\
 	}\
 	virtual const char* getName() const {return #cmdName;}\
 	virtual CTxtCommandResult execute(CONTEXT_CLASS& context,const NLMISC::CVectorSString& args,const NLMISC::CSString& rawArgs,const NLMISC::CSString& fullCmdLine);\
 private:\
-	__CTxtCommand_##cmdName() {}\
+	__CTxtCommand_##cmdName##CONTEXT_CLASS() {}\
 };\
-static ITxtCommandRegisterer<__CTxtCommand_##cmdName,__CTxtCommandSet_##setName> __CTxtCommand_##cmdName##_Registerer;\
-CTxtCommandResult __CTxtCommand_##cmdName::execute(CONTEXT_CLASS& context,const NLMISC::CVectorSString& args,const NLMISC::CSString& rawArgs,const NLMISC::CSString& fullCmdLine)
+static ITxtCommandRegisterer<__CTxtCommand_##cmdName##CONTEXT_CLASS,__CTxtCommandSet_##setName> __CTxtCommand_##cmdName##CONTEXT_CLASS##_Registerer;\
+CTxtCommandResult __CTxtCommand_##cmdName##CONTEXT_CLASS::execute(CONTEXT_CLASS& context,const NLMISC::CVectorSString& args,const NLMISC::CSString& rawArgs,const NLMISC::CSString& fullCmdLine)
 
 
 //-------------------------------------------------------------------------------------------------
diff --git a/code/ryzom/server/src/ai_service/child_container.h b/code/ryzom/server/src/ai_service/child_container.h
index 79ffa832c..ce2eb1d27 100644
--- a/code/ryzom/server/src/ai_service/child_container.h
+++ b/code/ryzom/server/src/ai_service/child_container.h
@@ -546,13 +546,13 @@ CAliasTreeOwner* CAliasCont<TChld>::getAliasChildByAlias(uint32 alias) const
 template <class TChld>
 CAliasTreeOwner* CAliasCont<TChld>::addAliasChild(CAliasTreeOwner* child)
 {
-	return NLMISC::type_cast<CAliasTreeOwner*>(addChild(static_cast<TChld*>(child)));
+	return NLMISC::type_cast<CAliasTreeOwner*>(this->addChild(static_cast<TChld*>(child)));
 }
 
 template <class TChld>
 CAliasTreeOwner* CAliasCont<TChld>::addAliasChild(CAliasTreeOwner* child, uint32 index)
 {
-	return NLMISC::type_cast<CAliasTreeOwner*>(addChild(static_cast<TChld*>(child), index));
+	return NLMISC::type_cast<CAliasTreeOwner*>(this->addChild(static_cast<TChld*>(child), index));
 }
 
 template <class TChld>
diff --git a/code/ryzom/server/src/ai_service/commands.cpp b/code/ryzom/server/src/ai_service/commands.cpp
index a85e8fe1c..98063d7e3 100644
--- a/code/ryzom/server/src/ai_service/commands.cpp
+++ b/code/ryzom/server/src/ai_service/commands.cpp
@@ -844,7 +844,7 @@ public:
 	}
 protected:	
 private:
-	size_t	_index;
+	uint32	_index;
 	float	_value;
 	bool	_detailled;
 	mutable	CLogStringWriter	_stringWriter;
diff --git a/code/ryzom/server/src/ai_service/family_profile.cpp b/code/ryzom/server/src/ai_service/family_profile.cpp
index c01faf37f..f95f142c9 100644
--- a/code/ryzom/server/src/ai_service/family_profile.cpp
+++ b/code/ryzom/server/src/ai_service/family_profile.cpp
@@ -172,6 +172,7 @@ IAiFactory<IFamilyProfile>	*_ProfileNpc=&_singleProfileNpc;
 
 extern	IAiFactory<IFamilyProfile>	*_ProfileTribe;	//	in another cpp.
 
+NL_ISO_TEMPLATE_SPEC CAiFactoryContainer<IFamilyProfile, TStringId> *CAiFactoryContainer<IFamilyProfile, TStringId>::_Instance = NULL;
 
 CFamilyProfileFactory::CFamilyProfileFactory()
 {
@@ -217,10 +218,6 @@ IFamilyProfile*	CFamilyProfileFactory::createFamilyProfile(const	TStringId	&keyW
 	return	NULL;
 }	
 
-
-NL_ISO_TEMPLATE_SPEC CAiFactoryContainer<IFamilyProfile, TStringId>	*CAiFactoryContainer<IFamilyProfile, TStringId>::_Instance = NULL;
-
-
 IFamilyProfile*	IFamilyProfile::createFamilyProfile(const	TStringId	&profileName, const	IFamilyProfile::CtorParam&	ctorParam)
 {
 	return	CFamilyProfileFactory::createFamilyProfile(profileName, ctorParam);
diff --git a/code/ryzom/server/src/ai_service/script_compiler.cpp b/code/ryzom/server/src/ai_service/script_compiler.cpp
index 03d0fe336..a9982ef48 100644
--- a/code/ryzom/server/src/ai_service/script_compiler.cpp
+++ b/code/ryzom/server/src/ai_service/script_compiler.cpp
@@ -1933,7 +1933,7 @@ void CSubRuleTracer::generateCode(CSmartPtr<AIVM::CByteCode> &cByteCode) const
 				case CScriptVM::JUMP:
 					byteCode.push_back(op); // + Jump offset.
 
-					size_t index;
+					uint32 index;
 					NLMISC::fromString(param, index);
 					jumpTable.add(CJumpRememberer(index));
 					byteCode.push_back(0); // Invalid
@@ -1950,7 +1950,7 @@ void CSubRuleTracer::generateCode(CSmartPtr<AIVM::CByteCode> &cByteCode) const
 			{
 				if (str.find("Atof")!=string::npos)
 				{
-					size_t index;
+					uint32 index;
 					NLMISC::fromString(param, index);
 					--index;
 					string &strRef=_childTracers[index]->_TextValue;
@@ -1962,7 +1962,7 @@ void CSubRuleTracer::generateCode(CSmartPtr<AIVM::CByteCode> &cByteCode) const
 				
 				if (str.find("String")!=string::npos)
 				{
-					size_t index;
+					uint32 index;
 					NLMISC::fromString(param, index);
 					--index;
 					string &strRef=_childTracers[index]->_TextValue;
@@ -2021,7 +2021,7 @@ void CSubRuleTracer::generateCode(CSmartPtr<AIVM::CByteCode> &cByteCode) const
 				
 				if (str.find("Code")!=string::npos)
 				{
-					size_t index;
+					uint32 index;
 					NLMISC::fromString(param, index);
 					--index;
 					if (byteCode.size()==0)
diff --git a/code/ryzom/server/src/entities_game_service/harvest_source.cpp b/code/ryzom/server/src/entities_game_service/harvest_source.cpp
index c655e2ebc..186615e45 100644
--- a/code/ryzom/server/src/entities_game_service/harvest_source.cpp
+++ b/code/ryzom/server/src/entities_game_service/harvest_source.cpp
@@ -90,6 +90,14 @@ sint8 ExplosionResetPeriod = 50; // 5 s
 
 CHarvestSource AutoSpawnSourceIniProperties;
 
+/*
+ * Access to singleton
+ */
+CHarvestSourceManager *CHarvestSourceManager::getInstance()
+{
+	return (CHarvestSourceManager*)_Instance;
+}
+
 /*
  * Initialization of source manager
  */
@@ -103,7 +111,10 @@ void CHarvestSourceManager::init( TDataSetIndex baseRowIndex, TDataSetIndex size
 	//AutoSpawnSourceIniProperties.setDistVis( 100 );
 }
 
-
+void CHarvestSourceManager::release()
+{
+	delete (CHarvestSourceManager*)_Instance;
+}
 
 /*
  * HarvestSource constructor
diff --git a/code/ryzom/server/src/entities_game_service/harvest_source.h b/code/ryzom/server/src/entities_game_service/harvest_source.h
index 59556115e..edd9c546a 100644
--- a/code/ryzom/server/src/entities_game_service/harvest_source.h
+++ b/code/ryzom/server/src/entities_game_service/harvest_source.h
@@ -391,13 +391,13 @@ class CHarvestSourceManager : public CSimpleEntityManager<CHarvestSource>
 public:
 
 	/// Singleton access
-	static CHarvestSourceManager *getInstance() { return (CHarvestSourceManager*)_Instance; }
+	static CHarvestSourceManager *getInstance();
 
 	/// Initialization
 	void		init( TDataSetIndex baseRowIndex, TDataSetIndex size );
 
 	/// Release
-	static void	release() { delete (CHarvestSourceManager*)_Instance; }
+	static void	release();
 };
 
 
diff --git a/code/ryzom/server/src/entities_game_service/phrase_manager/environmental_effect.cpp b/code/ryzom/server/src/entities_game_service/phrase_manager/environmental_effect.cpp
index 984003b20..fabb37350 100644
--- a/code/ryzom/server/src/entities_game_service/phrase_manager/environmental_effect.cpp
+++ b/code/ryzom/server/src/entities_game_service/phrase_manager/environmental_effect.cpp
@@ -67,3 +67,15 @@ NLMISC_DYNVARIABLE( uint, NbEnvironmentalEffects, "Number of environmental effec
 	if ( get )
 		*pointer = CEnvironmentalEffectManager::getInstance()->nbEntities();
 }
+
+/// Singleton access
+CEnvironmentalEffectManager *CEnvironmentalEffectManager::getInstance()
+{
+	return (CEnvironmentalEffectManager*)_Instance;
+}
+
+/// Release
+void CEnvironmentalEffectManager::release()
+{
+	delete (CEnvironmentalEffectManager*)_Instance;
+}
diff --git a/code/ryzom/server/src/entities_game_service/phrase_manager/environmental_effect.h b/code/ryzom/server/src/entities_game_service/phrase_manager/environmental_effect.h
index 0c81370a9..e53049cca 100644
--- a/code/ryzom/server/src/entities_game_service/phrase_manager/environmental_effect.h
+++ b/code/ryzom/server/src/entities_game_service/phrase_manager/environmental_effect.h
@@ -89,10 +89,10 @@ class CEnvironmentalEffectManager : public CSimpleEntityManager<CEnvironmentalEf
 public:
 
 	/// Singleton access
-	static CEnvironmentalEffectManager *getInstance() { return (CEnvironmentalEffectManager*)_Instance; }
+	static CEnvironmentalEffectManager *getInstance();
 
 	/// Release
-	static void	release() { delete (CEnvironmentalEffectManager*)_Instance; }
+	static void release();
 };
 
 
diff --git a/code/ryzom/server/src/entities_game_service/player_manager/cdb.h b/code/ryzom/server/src/entities_game_service/player_manager/cdb.h
index fccaff859..d1f7fd8f1 100644
--- a/code/ryzom/server/src/entities_game_service/player_manager/cdb.h
+++ b/code/ryzom/server/src/entities_game_service/player_manager/cdb.h
@@ -288,10 +288,10 @@ public :
 	TCDBDataIndex	getDataIndex() const { return _DataIndex; }
 
 	/// Set the atomic branch flag (when all the modified nodes of a branch should be tranmitted at the same time)
-	void			setAtomic( bool atomicBranch ) { _Atomic = atomicBranch; }
+	void			setAtomic( bool atomicBranch ) { _AtomicFlag = atomicBranch; }
 
 	/// Return true if the branch has the atomic flag
-	bool			isAtomic() const { return _Atomic; }
+	bool			isAtomic() const { return _AtomicFlag; }
 
 	/** Attach callback. Allow to attach a callback function that some code could call
 	 *	when an instance of this node is changed.
@@ -307,7 +307,7 @@ protected:
 	ICDBStructNode() 
 		: _BankLabels(NULL), 
 		  _DataIndex(CDB_INVALID_DATA_INDEX), 
-		  _Atomic(false),
+		  _AtomicFlag(false),
 		  _ChangeCallback(NULL)
 	{}
 
@@ -325,7 +325,7 @@ protected:
 	TCDBDataIndex			_DataIndex;
 
 	/// Atomic flag: is the branch an atomic group, or is the leaf a member of an atomic group
-	bool					_Atomic;
+	bool					_AtomicFlag;
 
 	/// Optional callback pointer.
 	TNodeChangeCallback		_ChangeCallback;
diff --git a/code/ryzom/server/src/entities_game_service/player_manager/cdb_branch.cpp b/code/ryzom/server/src/entities_game_service/player_manager/cdb_branch.cpp
index f95777359..156f17f14 100644
--- a/code/ryzom/server/src/entities_game_service/player_manager/cdb_branch.cpp
+++ b/code/ryzom/server/src/entities_game_service/player_manager/cdb_branch.cpp
@@ -186,7 +186,7 @@ void	ICDBStructNode::setLabel( const std::string& bankName )
  */
 void	CCDBStructNodeBranch::initDataIndex( TCDBDataIndex& index )
 {
-	if ( _Atomic )
+	if ( _AtomicFlag )
 	{
 		_DataIndex = index;
 		checkIfNotMaxIndex();
@@ -207,7 +207,7 @@ void	CCDBStructNodeBranch::initDataIndex( TCDBDataIndex& index )
  */
 void	CCDBStructNodeBranch::initIdAndCallForEachIndex( CBinId& id, void (*callback)(ICDBStructNode*, void*), void *arg )
 {
-	if ( _Atomic )
+	if ( _AtomicFlag )
 	{
 		callback( this, arg );
 	}
@@ -537,7 +537,7 @@ TCDBDataIndex	CCDBStructNodeBranch::findDataIndex( ICDBStructNode::CTextId& id )
  */
 void			CCDBStructNodeBranch::foreachAtomBranchCall( void (*callback)(void*,TCDBDataIndex), void *arg ) const
 {
-	if ( _Atomic )
+	if ( _AtomicFlag )
 	{
 		callback( arg, _DataIndex );
 	}
diff --git a/code/ryzom/server/src/pd_lib/pds_common.h b/code/ryzom/server/src/pd_lib/pds_common.h
index 040c0354b..18cb93c4a 100644
--- a/code/ryzom/server/src/pd_lib/pds_common.h
+++ b/code/ryzom/server/src/pd_lib/pds_common.h
@@ -144,7 +144,7 @@ bool	getProperty(xmlNodePtr node, const char* propName, T &result, const T &defa
 	if (!NLMISC::CIXml::getPropertyString(res, node, propName))
 	{
 		if (!quiet)
-			nlwarning("Couldn't get property '%s' in xml node, use '%s' value instead", propName, toString(defaultValue).c_str());
+			nlwarning("Couldn't get property '%s' in xml node, use '%s' value instead", propName, NLMISC::toString(defaultValue).c_str());
 		result = defaultValue;
 		return false;
 	}