diff --git a/code/CMakeModules/AndroidToolChain.cmake b/code/CMakeModules/AndroidToolChain.cmake
index 049c39adf..6690497d4 100644
--- a/code/CMakeModules/AndroidToolChain.cmake
+++ b/code/CMakeModules/AndroidToolChain.cmake
@@ -26,63 +26,46 @@ IF(TARGET_CPU STREQUAL "armv7")
   SET(LIBRARY_ARCHITECTURE "armeabi-v7a")
   SET(CMAKE_SYSTEM_PROCESSOR "armv7")
   SET(TOOLCHAIN_ARCH "arm")
-  SET(TOOLCHAIN_PREFIX "arm-linux-androideabi")
+  SET(GCC_TOOLCHAIN_PREFIX "arm-linux-androideabi")
   SET(TOOLCHAIN_BIN_PREFIX "arm")
   SET(MINIMUM_NDK_TARGET 4)
 ELSEIF(TARGET_CPU STREQUAL "armv5")
   SET(LIBRARY_ARCHITECTURE "armeabi")
   SET(CMAKE_SYSTEM_PROCESSOR "armv5")
   SET(TOOLCHAIN_ARCH "arm")
-  SET(TOOLCHAIN_PREFIX "arm-linux-androideabi")
+  SET(GCC_TOOLCHAIN_PREFIX "arm-linux-androideabi")
   SET(TOOLCHAIN_BIN_PREFIX "arm")
   SET(MINIMUM_NDK_TARGET 4)
 ELSEIF(TARGET_CPU STREQUAL "x86")
   SET(LIBRARY_ARCHITECTURE "x86")
   SET(CMAKE_SYSTEM_PROCESSOR "x86")
   SET(TOOLCHAIN_ARCH "x86")
-  SET(TOOLCHAIN_PREFIX "x86")
+  SET(GCC_TOOLCHAIN_PREFIX "x86")
   SET(TOOLCHAIN_BIN_PREFIX "i686")
   SET(MINIMUM_NDK_TARGET 9)
 ELSEIF(TARGET_CPU STREQUAL "mips")
   SET(LIBRARY_ARCHITECTURE "mips")
   SET(CMAKE_SYSTEM_PROCESSOR "mips")
   SET(TOOLCHAIN_ARCH "mips")
-  SET(TOOLCHAIN_PREFIX "mipsel-linux-android")
+  SET(GCC_TOOLCHAIN_PREFIX "mipsel-linux-android")
   SET(TOOLCHAIN_BIN_PREFIX "mipsel")
   SET(MINIMUM_NDK_TARGET 9)
 ENDIF(TARGET_CPU STREQUAL "armv7")
 
+SET(ANDROID_COMPILER "GCC")
+
+IF(NDK_TOOLCHAIN_VERSION STREQUAL "clang")
+  SET(ANDROID_COMPILER "clang")
+  SET(CLANG_TOOLCHAIN_PREFIX "llvm")
+  SET(CLANG ON)
+ELSE()
+  SET(GCC_TOOLCHAIN_VERSION ${NDK_TOOLCHAIN_VERSION})
+ENDIF()
+
 IF(NOT NDK_TARGET)
   SET(NDK_TARGET ${MINIMUM_NDK_TARGET})
 ENDIF(NOT NDK_TARGET)
 
-FILE(GLOB _TOOLCHAIN_VERSIONS "${NDK_ROOT}/toolchains/${TOOLCHAIN_PREFIX}-*")
-IF(_TOOLCHAIN_VERSIONS)
-  LIST(SORT _TOOLCHAIN_VERSIONS)
-  LIST(REVERSE _TOOLCHAIN_VERSIONS)
-  FOREACH(_TOOLCHAIN_VERSION ${_TOOLCHAIN_VERSIONS})
-    STRING(REGEX REPLACE ".+${TOOLCHAIN_PREFIX}-([0-9.]+)" "\\1" _TOOLCHAIN_VERSION "${_TOOLCHAIN_VERSION}")
-    IF(_TOOLCHAIN_VERSION MATCHES "^([0-9.]+)$")
-      LIST(APPEND NDK_TOOLCHAIN_VERSIONS ${_TOOLCHAIN_VERSION})
-    ENDIF(_TOOLCHAIN_VERSION MATCHES "^([0-9.]+)$")
-  ENDFOREACH(_TOOLCHAIN_VERSION)
-ENDIF(_TOOLCHAIN_VERSIONS)
-
-IF(NOT NDK_TOOLCHAIN_VERSIONS)
-  MESSAGE(FATAL_ERROR "No Android toolchain found in default search path ${NDK_ROOT}/toolchains")
-ENDIF(NOT NDK_TOOLCHAIN_VERSIONS)
-
-IF(NDK_TOOLCHAIN_VERSION)
-  LIST(FIND NDK_TOOLCHAIN_VERSIONS "${NDK_TOOLCHAIN_VERSION}" _INDEX)
-  IF(_INDEX EQUAL -1)
-    LIST(GET NDK_TOOLCHAIN_VERSIONS 0 NDK_TOOLCHAIN_VERSION)
-  ENDIF(_INDEX EQUAL -1)
-ELSE(NDK_TOOLCHAIN_VERSION)
-  LIST(GET NDK_TOOLCHAIN_VERSIONS 0 NDK_TOOLCHAIN_VERSION)
-ENDIF(NDK_TOOLCHAIN_VERSION)
-
-MESSAGE(STATUS "Target Android NDK ${NDK_TARGET} and use GCC ${NDK_TOOLCHAIN_VERSION}")
-
 IF(CMAKE_HOST_WIN32)
   SET(TOOLCHAIN_HOST "windows")
   SET(TOOLCHAIN_BIN_SUFFIX ".exe")
@@ -94,33 +77,73 @@ ELSEIF(CMAKE_HOST_UNIX)
   SET(TOOLCHAIN_BIN_SUFFIX "")
 ENDIF(CMAKE_HOST_WIN32)
 
-SET(TOOLCHAIN_ROOT "${NDK_ROOT}/toolchains/${TOOLCHAIN_PREFIX}-${NDK_TOOLCHAIN_VERSION}/prebuilt/${TOOLCHAIN_HOST}")
+MACRO(SEARCH_TOOLCHAIN _COMPILER)
+  SET(${_COMPILER}_TOOLCHAIN_VERSIONS)
+  FILE(GLOB _TOOLCHAIN_VERSIONS "${NDK_ROOT}/toolchains/${${_COMPILER}_TOOLCHAIN_PREFIX}-*")
+  IF(_TOOLCHAIN_VERSIONS)
+    LIST(SORT _TOOLCHAIN_VERSIONS)
+    LIST(REVERSE _TOOLCHAIN_VERSIONS)
+    FOREACH(_TOOLCHAIN_VERSION ${_TOOLCHAIN_VERSIONS})
+      STRING(REGEX REPLACE ".+${_PREFIX}-([0-9.]+)" "\\1" _TOOLCHAIN_VERSION "${_TOOLCHAIN_VERSION}")
+      IF(_TOOLCHAIN_VERSION MATCHES "^([0-9.]+)$")
+        LIST(APPEND ${_COMPILER}_TOOLCHAIN_VERSIONS ${_TOOLCHAIN_VERSION})
+      ENDIF()
+    ENDFOREACH()
+  ENDIF()
+
+  IF(NOT ${_COMPILER}_TOOLCHAIN_VERSIONS)
+    MESSAGE(FATAL_ERROR "No Android ${_COMPILER} toolchain found in default search path ${NDK_ROOT}/toolchains")
+  ENDIF()
+
+  IF(${_COMPILER}_TOOLCHAIN_VERSIONS)
+    LIST(FIND ${_COMPILER}_TOOLCHAIN_VERSIONS "${${_COMPILER}_TOOLCHAIN_VERSION}" _INDEX)
+    IF(_INDEX EQUAL -1)
+      LIST(GET ${_COMPILER}_TOOLCHAIN_VERSIONS 0 ${_COMPILER}_TOOLCHAIN_VERSION)
+    ENDIF()
+  ELSE()
+    LIST(GET ${_COMPILER}_TOOLCHAIN_VERSIONS 0 ${_COMPILER}_TOOLCHAIN_VERSION)
+  ENDIF()
+
+  SET(${_COMPILER}_TOOLCHAIN_ROOT "${NDK_ROOT}/toolchains/${${_COMPILER}_TOOLCHAIN_PREFIX}-${${_COMPILER}_TOOLCHAIN_VERSION}/prebuilt/${TOOLCHAIN_HOST}")
+
+  IF(NOT EXISTS "${${_COMPILER}_TOOLCHAIN_ROOT}")
+    FILE(GLOB _TOOLCHAIN_PREFIXES "${${_COMPILER}_TOOLCHAIN_ROOT}*")
+    IF(_TOOLCHAIN_PREFIXES)
+      LIST(GET _TOOLCHAIN_PREFIXES 0 ${_COMPILER}_TOOLCHAIN_ROOT)
+    ENDIF(_TOOLCHAIN_PREFIXES)
+  ENDIF()
+ENDMACRO()
+
+IF(CLANG)
+  SEARCH_TOOLCHAIN(CLANG)
+
+  MESSAGE(STATUS "Target Android NDK ${NDK_TARGET} and use clang ${CLANG_TOOLCHAIN_VERSION}")
+ENDIF()
+
+SEARCH_TOOLCHAIN(GCC)
+
+MESSAGE(STATUS "Target Android NDK ${NDK_TARGET} and use GCC ${GCC_TOOLCHAIN_VERSION}")
+MESSAGE(STATUS "Found Android LLVM toolchain in ${CLANG_TOOLCHAIN_ROOT}")
+MESSAGE(STATUS "Found Android GCC toolchain in ${GCC_TOOLCHAIN_ROOT}")
+
 SET(PLATFORM_ROOT "${NDK_ROOT}/platforms/android-${NDK_TARGET}/arch-${TOOLCHAIN_ARCH}")
 
-IF(NOT EXISTS "${TOOLCHAIN_ROOT}")
-  FILE(GLOB _TOOLCHAIN_PREFIXES "${TOOLCHAIN_ROOT}*")
-  IF(_TOOLCHAIN_PREFIXES)
-    LIST(GET _TOOLCHAIN_PREFIXES 0 TOOLCHAIN_ROOT)
-  ENDIF(_TOOLCHAIN_PREFIXES)
-ENDIF(NOT EXISTS "${TOOLCHAIN_ROOT}")
-
-MESSAGE(STATUS "Found Android toolchain in ${TOOLCHAIN_ROOT}")
 MESSAGE(STATUS "Found Android platform in ${PLATFORM_ROOT}")
 
 # include dirs
 SET(PLATFORM_INCLUDE_DIR "${PLATFORM_ROOT}/usr/include")
 SET(STL_DIR "${NDK_ROOT}/sources/cxx-stl/gnu-libstdc++")
 
-IF(EXISTS "${STL_DIR}/${NDK_TOOLCHAIN_VERSION}")
+IF(EXISTS "${STL_DIR}/${GCC_TOOLCHAIN_VERSION}")
   # NDK version >= 8b
-  SET(STL_DIR "${STL_DIR}/${NDK_TOOLCHAIN_VERSION}")
-ENDIF(EXISTS "${STL_DIR}/${NDK_TOOLCHAIN_VERSION}")
+  SET(STL_DIR "${STL_DIR}/${GCC_TOOLCHAIN_VERSION}")
+ENDIF(EXISTS "${STL_DIR}/${GCC_TOOLCHAIN_VERSION}")
 
 # Determine bin prefix for toolchain
-FILE(GLOB _TOOLCHAIN_BIN_PREFIXES "${TOOLCHAIN_ROOT}/bin/${TOOLCHAIN_BIN_PREFIX}-*-gcc${TOOLCHAIN_BIN_SUFFIX}")
+FILE(GLOB _TOOLCHAIN_BIN_PREFIXES "${GCC_TOOLCHAIN_ROOT}/bin/${TOOLCHAIN_BIN_PREFIX}-*-gcc${TOOLCHAIN_BIN_SUFFIX}")
 IF(_TOOLCHAIN_BIN_PREFIXES)
   LIST(GET _TOOLCHAIN_BIN_PREFIXES 0 _TOOLCHAIN_BIN_PREFIX)
-  STRING(REGEX REPLACE "${TOOLCHAIN_ROOT}/bin/([a-z0-9-]+)-gcc${TOOLCHAIN_BIN_SUFFIX}" "\\1" TOOLCHAIN_BIN_PREFIX "${_TOOLCHAIN_BIN_PREFIX}")
+  STRING(REGEX REPLACE "${GCC_TOOLCHAIN_ROOT}/bin/([a-z0-9-]+)-gcc${TOOLCHAIN_BIN_SUFFIX}" "\\1" TOOLCHAIN_BIN_PREFIX "${_TOOLCHAIN_BIN_PREFIX}")
 ENDIF(_TOOLCHAIN_BIN_PREFIXES)
 
 SET(STL_INCLUDE_DIR "${STL_DIR}/include")
@@ -128,22 +151,48 @@ SET(STL_LIBRARY_DIR "${STL_DIR}/libs/${LIBRARY_ARCHITECTURE}")
 SET(STL_INCLUDE_CPU_DIR "${STL_LIBRARY_DIR}/include")
 SET(STL_LIBRARY "${STL_LIBRARY_DIR}/libgnustl_static.a")
 
-SET(CMAKE_FIND_ROOT_PATH ${TOOLCHAIN_ROOT} ${PLATFORM_ROOT}/usr ${CMAKE_PREFIX_PATH} ${CMAKE_INSTALL_PREFIX} $ENV{EXTERNAL_ANDROID_PATH} CACHE string  "Android find search path root")
+MESSAGE(STATUS "STL include dir: ${STL_INCLUDE_DIR}")
+MESSAGE(STATUS "STL library dir: ${STL_LIBRARY_DIR}")
+
+SET(CMAKE_FIND_ROOT_PATH ${CLANG_TOOLCHAIN_ROOT} ${GCC_TOOLCHAIN_ROOT} ${PLATFORM_ROOT}/usr ${CMAKE_PREFIX_PATH} ${CMAKE_INSTALL_PREFIX} $ENV{EXTERNAL_ANDROID_PATH} CACHE string  "Android find search path root")
 
 SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY)
 SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 
-INCLUDE_DIRECTORIES(${STL_INCLUDE_DIR} ${STL_INCLUDE_CPU_DIR})
-
 MACRO(SET_TOOLCHAIN_BINARY _NAME _BINARY)
-  SET(${_NAME} ${TOOLCHAIN_ROOT}/bin/${TOOLCHAIN_BIN_PREFIX}-${_BINARY}${TOOLCHAIN_BIN_SUFFIX})
+  IF("${_BINARY}" MATCHES "clang")
+    SET(${_NAME} ${CLANG_TOOLCHAIN_ROOT}/bin/${_BINARY}${TOOLCHAIN_BIN_SUFFIX} CACHE PATH "" FORCE )
+  ELSE()
+    SET(${_NAME} ${GCC_TOOLCHAIN_ROOT}/bin/${TOOLCHAIN_BIN_PREFIX}-${_BINARY}${TOOLCHAIN_BIN_SUFFIX} CACHE PATH "" FORCE)
+  ENDIF()
 ENDMACRO(SET_TOOLCHAIN_BINARY)
 
-SET_TOOLCHAIN_BINARY(CMAKE_C_COMPILER gcc)
-SET_TOOLCHAIN_BINARY(CMAKE_CXX_COMPILER g++)
-
 # Force the compilers to GCC for Android
 include (CMakeForceCompiler)
-CMAKE_FORCE_C_COMPILER(${CMAKE_C_COMPILER} GNU)
-CMAKE_FORCE_CXX_COMPILER(${CMAKE_CXX_COMPILER} GNU)
+
+IF(CLANG)
+  SET_TOOLCHAIN_BINARY(CMAKE_C_COMPILER clang)
+  SET_TOOLCHAIN_BINARY(CMAKE_CXX_COMPILER clang++)
+
+  CMAKE_FORCE_C_COMPILER(${CMAKE_C_COMPILER} clang)
+  CMAKE_FORCE_CXX_COMPILER(${CMAKE_CXX_COMPILER} clang)
+
+  MESSAGE(STATUS "Using clang compiler")
+ELSE()
+  SET_TOOLCHAIN_BINARY(CMAKE_C_COMPILER gcc)
+  SET_TOOLCHAIN_BINARY(CMAKE_CXX_COMPILER g++)
+
+  CMAKE_FORCE_C_COMPILER(${CMAKE_C_COMPILER} GNU)
+  CMAKE_FORCE_CXX_COMPILER(${CMAKE_CXX_COMPILER} GNU)
+
+  MESSAGE(STATUS "Using GCC compiler")
+ENDIF()
+
+SET_TOOLCHAIN_BINARY(CMAKE_STRIP strip)
+SET_TOOLCHAIN_BINARY(CMAKE_AR ar)
+SET_TOOLCHAIN_BINARY(CMAKE_LINKER ld)
+SET_TOOLCHAIN_BINARY(CMAKE_NM nm)
+SET_TOOLCHAIN_BINARY(CMAKE_OBJCOPY objcopy)
+SET_TOOLCHAIN_BINARY(CMAKE_OBJDUMP objdump)
+SET_TOOLCHAIN_BINARY(CMAKE_RANLIB ranlib)
diff --git a/code/CMakeModules/FindMSVC.cmake b/code/CMakeModules/FindMSVC.cmake
index 16455b02d..644fc57e6 100644
--- a/code/CMakeModules/FindMSVC.cmake
+++ b/code/CMakeModules/FindMSVC.cmake
@@ -57,6 +57,7 @@ ENDMACRO(DETECT_EXPRESS_VERSION)
 
 IF(MSVC12)
   DETECT_VC_VERSION("12.0")
+  SET(MSVC_TOOLSET "120")
 
   IF(NOT MSVC12_REDIST_DIR)
     # If you have VC++ 2013 Express, put x64/Microsoft.VC120.CRT/*.dll in ${EXTERNAL_PATH}/redist
@@ -64,6 +65,7 @@ IF(MSVC12)
   ENDIF(NOT MSVC11_REDIST_DIR)
 ELSEIF(MSVC11)
   DETECT_VC_VERSION("11.0")
+  SET(MSVC_TOOLSET "110")
 
   IF(NOT MSVC11_REDIST_DIR)
     # If you have VC++ 2012 Express, put x64/Microsoft.VC110.CRT/*.dll in ${EXTERNAL_PATH}/redist
@@ -71,6 +73,7 @@ ELSEIF(MSVC11)
   ENDIF(NOT MSVC11_REDIST_DIR)
 ELSEIF(MSVC10)
   DETECT_VC_VERSION("10.0")
+  SET(MSVC_TOOLSET "100")
 
   IF(NOT MSVC10_REDIST_DIR)
     # If you have VC++ 2010 Express, put x64/Microsoft.VC100.CRT/*.dll in ${EXTERNAL_PATH}/redist
@@ -78,8 +81,10 @@ ELSEIF(MSVC10)
   ENDIF(NOT MSVC10_REDIST_DIR)
 ELSEIF(MSVC90)
   DETECT_VC_VERSION("9.0")
+  SET(MSVC_TOOLSET "90")
 ELSEIF(MSVC80)
   DETECT_VC_VERSION("8.0")
+  SET(MSVC_TOOLSET "80")
 ENDIF(MSVC12)
 
 # If you plan to use VC++ compilers with WINE, set VC_DIR environment variable
diff --git a/code/CMakeModules/FindMySQL.cmake b/code/CMakeModules/FindMySQL.cmake
index eb2102c8d..0e0ebfd48 100644
--- a/code/CMakeModules/FindMySQL.cmake
+++ b/code/CMakeModules/FindMySQL.cmake
@@ -13,7 +13,7 @@
 IF(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES)
    SET(MYSQL_FOUND TRUE)
 
-ELSE(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES)
+ELSE()
 
   FIND_PATH(MYSQL_INCLUDE_DIR mysql.h
       PATH_SUFFIXES mysql
@@ -33,7 +33,7 @@ ELSE(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES)
       PATHS
       $ENV{ProgramFiles}/MySQL/*/lib/opt
       $ENV{SystemDrive}/MySQL/*/lib/opt)
-  ELSE(WIN32 AND MSVC)
+  ELSE()
     FIND_LIBRARY(MYSQL_LIBRARY_RELEASE NAMES mysqlclient
       PATHS
       /usr/lib
@@ -51,31 +51,30 @@ ELSE(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES)
       /usr/local/lib/mysql
       /opt/local/lib/mysql5/mysql
       )
-  ENDIF(WIN32 AND MSVC)
+  ENDIF()
 
   IF(MYSQL_INCLUDE_DIR)
     IF(MYSQL_LIBRARY_RELEASE)
-      SET(MYSQL_LIBRARIES optimized ${MYSQL_LIBRARY_RELEASE})
       IF(MYSQL_LIBRARY_DEBUG)
-        SET(MYSQL_LIBRARIES ${MYSQL_LIBRARIES} debug ${MYSQL_LIBRARY_DEBUG})
-      ELSE(MYSQL_LIBRARY_DEBUG)
-	    SET(MYSQL_LIBRARIES ${MYSQL_LIBRARIES} debug ${MYSQL_LIBRARY_RELEASE})
-      ENDIF(MYSQL_LIBRARY_DEBUG)
+        SET(MYSQL_LIBRARIES optimized ${MYSQL_LIBRARY_RELEASE} debug ${MYSQL_LIBRARY_DEBUG})
+      ELSE()
+	    SET(MYSQL_LIBRARIES ${MYSQL_LIBRARY_RELEASE})
+      ENDIF()
       FIND_PACKAGE(OpenSSL)
       IF(OPENSSL_FOUND)
         SET(MYSQL_LIBRARIES ${MYSQL_LIBRARIES} ${OPENSSL_LIBRARIES})
-      ENDIF(OPENSSL_FOUND)
-    ENDIF(MYSQL_LIBRARY_RELEASE)
-  ENDIF(MYSQL_INCLUDE_DIR)
+      ENDIF()
+    ENDIF()
+  ENDIF()
 
   IF(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES)
     SET(MYSQL_FOUND TRUE)
     MESSAGE(STATUS "Found MySQL: ${MYSQL_INCLUDE_DIR}, ${MYSQL_LIBRARIES}")
-  ELSE(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES)
+  ELSE()
     SET(MYSQL_FOUND FALSE)
     MESSAGE(STATUS "MySQL not found.")
-  ENDIF(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES)
+  ENDIF()
 
   MARK_AS_ADVANCED(MYSQL_LIBRARY_RELEASE MYSQL_LIBRARY_DEBUG)
 
-ENDIF(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES)
+ENDIF()
diff --git a/code/CMakeModules/FindWindowsSDK.cmake b/code/CMakeModules/FindWindowsSDK.cmake
index 2e72af9e5..31288eb03 100644
--- a/code/CMakeModules/FindWindowsSDK.cmake
+++ b/code/CMakeModules/FindWindowsSDK.cmake
@@ -68,6 +68,10 @@ ENDIF(WINSDKCURRENT_VERSION_INCLUDE)
 
 SET(WINSDKENV_DIR $ENV{WINSDK_DIR})
 
+IF(NOT WINSDKENV_DIR)
+  SET(WINSDKENV_DIR $ENV{WindowsSDKDir})
+ENDIF(NOT WINSDKENV_DIR)
+
 MACRO(FIND_WINSDK_VERSION_HEADERS)
   IF(WINSDK_DIR AND NOT WINSDK_VERSION)
     # Search version in headers
@@ -78,7 +82,6 @@ MACRO(FIND_WINSDK_VERSION_HEADERS)
     )
 
     IF(_MSI_FILE)
-
       # Look for Windows SDK 8.0
       FILE(STRINGS ${_MSI_FILE} _CONTENT REGEX "^#ifndef NTDDI_WIN8")
 
@@ -181,7 +184,7 @@ MACRO(USE_CURRENT_WINSDK)
       # Look for Windows.h because there are several paths
       IF(EXISTS ${_INCLUDE}/Windows.h)
         STRING(REGEX REPLACE "/(include|INCLUDE|Include)(.*)" "" WINSDK_DIR ${_INCLUDE})
-        MESSAGE(STATUS "Found Windows SDK from include environment variable in ${WINSDK_DIR}")
+        MESSAGE(STATUS "Found Windows SDK in INCLUDE environment variable: ${WINSDK_DIR}")
         BREAK()
       ENDIF(EXISTS ${_INCLUDE}/Windows.h)
     ENDFOREACH(_INCLUDE)
@@ -280,6 +283,13 @@ FIND_PATH(WINSDK_SHARED_INCLUDE_DIR d3d9.h
   ${WINSDK_DIR}/Include
 )
 
+# directory where OpenGL headers are found
+FIND_PATH(WINSDK_OPENGL_INCLUDE_DIR GL.h
+  HINTS
+  ${WINSDK_DIR}/Include/gl
+  ${WINSDK_DIR}/Include
+)
+
 # directory where all libraries are found
 FIND_PATH(WINSDK_LIBRARY_DIR ComCtl32.lib
   HINTS
@@ -303,7 +313,7 @@ FIND_PROGRAM(WINSDK_MIDL midl
 
 IF(WINSDK_INCLUDE_DIR)
   SET(WINSDK_FOUND ON)
-  SET(WINSDK_INCLUDE_DIRS ${WINSDK_INCLUDE_DIR} ${WINSDK_SHARED_INCLUDE_DIR})
+  SET(WINSDK_INCLUDE_DIRS ${WINSDK_INCLUDE_DIR} ${WINSDK_SHARED_INCLUDE_DIR} ${WINSDK_OPENGL_INCLUDE_DIR})
   SET(CMAKE_LIBRARY_PATH ${WINSDK_LIBRARY_DIR} ${CMAKE_LIBRARY_PATH})
   INCLUDE_DIRECTORIES(${WINSDK_INCLUDE_DIRS})
 
diff --git a/code/CMakeModules/GetRevision.cmake b/code/CMakeModules/GetRevision.cmake
index 21b234f74..7f0a4e5f1 100644
--- a/code/CMakeModules/GetRevision.cmake
+++ b/code/CMakeModules/GetRevision.cmake
@@ -13,38 +13,44 @@ IF(SOURCE_DIR)
 
   IF(NOT ROOT_DIR AND SOURCE_DIR)
     SET(ROOT_DIR ${SOURCE_DIR})
-  ENDIF(NOT ROOT_DIR AND SOURCE_DIR)
+  ENDIF()
 
   IF(NOT SOURCE_DIR AND ROOT_DIR)
     SET(SOURCE_DIR ${ROOT_DIR})
-  ENDIF(NOT SOURCE_DIR AND ROOT_DIR)
-ELSE(SOURCE_DIR)
+  ENDIF()
+ELSE()
   SET(SOURCE_DIR ${CMAKE_SOURCE_DIR})
   SET(ROOT_DIR ${CMAKE_SOURCE_DIR})
-ENDIF(SOURCE_DIR)
+ENDIF()
 
 MACRO(NOW RESULT)
   IF (WIN32)
     EXECUTE_PROCESS(COMMAND "wmic" "os" "get" "localdatetime" OUTPUT_VARIABLE DATETIME)
     IF(NOT DATETIME MATCHES "ERROR")
       STRING(REGEX REPLACE ".*\n([0-9][0-9][0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9]).*" "\\1-\\2-\\3 \\4:\\5:\\6" ${RESULT} "${DATETIME}")
-    ENDIF(NOT DATETIME MATCHES "ERROR")
+    ENDIF()
   ELSEIF(UNIX)
     EXECUTE_PROCESS(COMMAND "date" "+%Y-%m-%d %H:%M:%S" OUTPUT_VARIABLE DATETIME)
     STRING(REGEX REPLACE "([0-9: -]+).*" "\\1" ${RESULT} "${DATETIME}")
-  ELSE (WIN32)
+  ELSE()
     MESSAGE(SEND_ERROR "date not implemented")
     SET(${RESULT} "0000-00-00 00:00:00")
-  ENDIF (WIN32)
+  ENDIF()
 ENDMACRO(NOW)
 
 IF(EXISTS "${ROOT_DIR}/.svn/")
-  FIND_PACKAGE(Subversion)
+  FIND_PACKAGE(Subversion QUIET)
 
   IF(SUBVERSION_FOUND)
     Subversion_WC_INFO(${ROOT_DIR} ER)
     SET(REVISION ${ER_WC_REVISION})
   ENDIF(SUBVERSION_FOUND)
+
+  FIND_PACKAGE(TortoiseSVN QUIET)
+
+  IF(TORTOISESVN_FOUND)
+    TORTOISESVN_GET_REVISION(${ROOT_DIR} REVISION)
+  ENDIF(TORTOISESVN_FOUND)
 ENDIF(EXISTS "${ROOT_DIR}/.svn/")
 
 IF(EXISTS "${ROOT_DIR}/.hg/")
@@ -55,8 +61,8 @@ IF(EXISTS "${ROOT_DIR}/.hg/")
     SET(REVISION ${ER_WC_REVISION})
     SET(CHANGESET ${ER_WC_CHANGESET})
     SET(BRANCH ${ER_WC_BRANCH})
-  ENDIF(MERCURIAL_FOUND)
-ENDIF(EXISTS "${ROOT_DIR}/.hg/")
+  ENDIF()
+ENDIF()
 
 # if processing exported sources, use "revision" file if exists
 IF(SOURCE_DIR AND NOT DEFINED REVISION)
@@ -64,8 +70,8 @@ IF(SOURCE_DIR AND NOT DEFINED REVISION)
   IF(EXISTS ${REVISION_FILE})
     FILE(STRINGS ${REVISION_FILE} REVISION LIMIT_COUNT 1)
     MESSAGE(STATUS "Read revision ${REVISION} from file")
-  ENDIF(EXISTS ${REVISION_FILE})
-ENDIF(SOURCE_DIR AND NOT DEFINED REVISION)
+  ENDIF()
+ENDIF()
 
 IF(SOURCE_DIR AND DEFINED REVISION)
   IF(EXISTS ${SOURCE_DIR}/revision.h.in)
@@ -73,5 +79,5 @@ IF(SOURCE_DIR AND DEFINED REVISION)
     NOW(BUILD_DATE)
     CONFIGURE_FILE(${SOURCE_DIR}/revision.h.in revision.h.txt)
     EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E copy revision.h.txt revision.h) # copy_if_different
-  ENDIF(EXISTS ${SOURCE_DIR}/revision.h.in)
-ENDIF(SOURCE_DIR AND DEFINED REVISION)
+  ENDIF()
+ENDIF()
diff --git a/code/CMakeModules/nel.cmake b/code/CMakeModules/nel.cmake
index 0474c7d7b..fd7004884 100644
--- a/code/CMakeModules/nel.cmake
+++ b/code/CMakeModules/nel.cmake
@@ -6,6 +6,9 @@ IF(NOT CMAKE_BUILD_TYPE)
   SET(CMAKE_BUILD_TYPE "Release" CACHE STRING "" FORCE)
 ENDIF(NOT CMAKE_BUILD_TYPE)
 
+# Declare CMAKE_CONFIGURATION_TYPES before PROJECT
+SET(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "" FORCE)
+
 ###
 # Helper macro that generates .pc and installs it.
 # Argument: name - the name of the .pc package, e.g. "nel-pacs.pc"
@@ -384,8 +387,6 @@ MACRO(NL_SETUP_BUILD)
   # Debug                 = NL_DEBUG
   # Release               = NL_RELEASE
 
-  SET(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "" FORCE)
-
   IF(CMAKE_BUILD_TYPE MATCHES "Debug")
     SET(NL_BUILD_MODE "NL_DEBUG")
   ELSE(CMAKE_BUILD_TYPE MATCHES "Debug")
diff --git a/code/nel/include/nel/3d/track_tcb.h b/code/nel/include/nel/3d/track_tcb.h
index e91cfb397..153dcbc54 100644
--- a/code/nel/include/nel/3d/track_tcb.h
+++ b/code/nel/include/nel/3d/track_tcb.h
@@ -218,7 +218,7 @@ protected:
 			date*= previous->OODeltaTime;
 			NLMISC::clamp(date, 0,1);
 
-			date = this->ease(previous, date);
+			date = this->ease(previous, (float)date);
 
 			float hb[4];
 			this->computeHermiteBasis(date, hb);
diff --git a/code/nel/src/3d/vertex_program_parse.cpp b/code/nel/src/3d/vertex_program_parse.cpp
index 40ac2282e..0e144d54f 100644
--- a/code/nel/src/3d/vertex_program_parse.cpp
+++ b/code/nel/src/3d/vertex_program_parse.cpp
@@ -17,7 +17,86 @@
 #include "std3d.h"
 #include "nel/3d/vertex_program_parse.h"
 
-
+enum TArguments
+{
+#ifdef NL_LITTLE_ENDIAN
+	ADD  = 1094992928,
+	ARL  = 1095912480,
+	BFC0 = 1111900976,
+	BFC1 = 1111900977,
+	COL0 = 1129270320,
+	COL1 = 1129270321,
+	DP3  = 1146106656,
+	DP4  = 1146106912,
+	DST  = 1146311712,
+	END  = 1162757152,
+	EXP  = 1163415584,
+	EXPP = 1163415632,
+	FOGC = 1179600707,
+	HPOS = 1213222739,
+	LIT  = 1279874080,
+	LOG  = 1280263968,
+	MAD  = 1296122912,
+	MAX  = 1296128032,
+	MIN  = 1296649760,
+	MOV  = 1297045024,
+	MUL  = 1297435680,
+	NRML = 1314016588,
+	OPOS = 1330663251,
+	PSIZ = 1347635546,
+	RCP  = 1380143136,
+	RSQ  = 1381191968,
+	SGE  = 1397179680,
+	SLT  = 1397511200,
+	TEX0 = 1413830704,
+	TEX1 = 1413830705,
+	TEX2 = 1413830706,
+	TEX3 = 1413830707,
+	TEX4 = 1413830708,
+	TEX5 = 1413830709,
+	TEX6 = 1413830710,
+	TEX7 = 1413830711,
+	WGHT = 1464289364,
+#else
+	ADD  = 541344833,
+	ARL  = 541872705,
+	BFC0 = 809715266,
+	BFC1 = 826492482,
+	COL0 = 810307395,
+	COL1 = 827084611,
+	DP3  = 540233796,
+	DP4  = 540299332,
+	DST  = 542397252,
+	END  = 541347397,
+	EXP  = 542136389,
+	EXPP = 1347442757,
+	FOGC = 1128746822,
+	HPOS = 1397706824,
+	LIT  = 542394700,
+	LOG  = 541544268,
+	MAD  = 541344077,
+	MAX  = 542654797,
+	MIN  = 542001485,
+	MOV  = 542527309,
+	MUL  = 541873485,
+	NRML = 1280135758,
+	OPOS = 1397706831,
+	PSIZ = 1514754896,
+	RCP  = 542131026,
+	RSQ  = 542200658,
+	SGE  = 541411155,
+	SLT  = 542395475,
+	TEX0 = 811091284,
+	TEX1 = 827868500,
+	TEX2 = 844645716,
+	TEX3 = 861422932,
+	TEX4 = 878200148,
+	TEX5 = 894977364,
+	TEX6 = 911754580,
+	TEX7 = 928531796,
+	WGHT = 1414022999,
+#endif
+};
 
 //=====================================
 bool CVPParser::parseWriteMask(uint &mask, std::string &errorOutput)
@@ -256,23 +335,23 @@ bool CVPParser::parseInputRegister(CVPOperand &operand, std::string &errorOutput
 			strValue |= ((uint32) *_CurrChar) << (8 * (3 - k));
 			++_CurrChar;
 		}
-		switch (strValue)
+		switch ((TArguments)strValue)
 		{
-			case 'OPOS': operand.Value.InputRegisterValue = CVPOperand::IPosition; break;
-			case 'WGHT': operand.Value.InputRegisterValue = CVPOperand::IWeight; break;
-			case 'NRML': operand.Value.InputRegisterValue = CVPOperand::INormal; break;
-			case 'COL0': operand.Value.InputRegisterValue = CVPOperand::IPrimaryColor; break;
-			case 'COL1': operand.Value.InputRegisterValue = CVPOperand::ISecondaryColor; break;
-			case 'FOGC': operand.Value.InputRegisterValue = CVPOperand::IFogCoord; break;
+			case OPOS: operand.Value.InputRegisterValue = CVPOperand::IPosition; break;
+			case WGHT: operand.Value.InputRegisterValue = CVPOperand::IWeight; break;
+			case NRML: operand.Value.InputRegisterValue = CVPOperand::INormal; break;
+			case COL0: operand.Value.InputRegisterValue = CVPOperand::IPrimaryColor; break;
+			case COL1: operand.Value.InputRegisterValue = CVPOperand::ISecondaryColor; break;
+			case FOGC: operand.Value.InputRegisterValue = CVPOperand::IFogCoord; break;
 			// texture argument
-			case 'TEX0':
-			case 'TEX1':
-			case 'TEX2':
-			case 'TEX3':
-			case 'TEX4':
-			case 'TEX5':
-			case 'TEX6':
-			case 'TEX7':
+			case TEX0:
+			case TEX1:
+			case TEX2:
+			case TEX3:
+			case TEX4:
+			case TEX5:
+			case TEX6:
+			case TEX7:
 				operand.Value.InputRegisterValue = (CVPOperand::EInputRegister) (((CVPOperand::ITex0 + strValue) & 0xff) - '0');
 			break;
 			default:
@@ -384,23 +463,23 @@ bool CVPParser::parseOutputRegister(CVPOperand &operand, std::string &errorOutpu
 		++_CurrChar;
 	}
 	// convert to enum
-	switch(strValue)
+	switch((TArguments)strValue)
 	{
-		case 'HPOS': operand.Value.OutputRegisterValue = CVPOperand::OHPosition; break;
-		case 'COL0': operand.Value.OutputRegisterValue = CVPOperand::OPrimaryColor; break;
-		case 'COL1': operand.Value.OutputRegisterValue = CVPOperand::OSecondaryColor; break;
-		case 'BFC0': operand.Value.OutputRegisterValue = CVPOperand::OBackFacePrimaryColor; break;
-		case 'BFC1': operand.Value.OutputRegisterValue = CVPOperand::OBackFaceSecondaryColor; break;
-		case 'FOGC': operand.Value.OutputRegisterValue = CVPOperand::OFogCoord; break;
-		case 'PSIZ': operand.Value.OutputRegisterValue = CVPOperand::OPointSize; break;
-		case 'TEX0': operand.Value.OutputRegisterValue = CVPOperand::OTex0; break;
-		case 'TEX1': operand.Value.OutputRegisterValue = CVPOperand::OTex1; break;
-		case 'TEX2': operand.Value.OutputRegisterValue = CVPOperand::OTex2; break;
-		case 'TEX3': operand.Value.OutputRegisterValue = CVPOperand::OTex3; break;
-		case 'TEX4': operand.Value.OutputRegisterValue = CVPOperand::OTex4; break;
-		case 'TEX5': operand.Value.OutputRegisterValue = CVPOperand::OTex5; break;
-		case 'TEX6': operand.Value.OutputRegisterValue = CVPOperand::OTex6; break;
-		case 'TEX7': operand.Value.OutputRegisterValue = CVPOperand::OTex7; break;
+		case HPOS: operand.Value.OutputRegisterValue = CVPOperand::OHPosition; break;
+		case COL0: operand.Value.OutputRegisterValue = CVPOperand::OPrimaryColor; break;
+		case COL1: operand.Value.OutputRegisterValue = CVPOperand::OSecondaryColor; break;
+		case BFC0: operand.Value.OutputRegisterValue = CVPOperand::OBackFacePrimaryColor; break;
+		case BFC1: operand.Value.OutputRegisterValue = CVPOperand::OBackFaceSecondaryColor; break;
+		case FOGC: operand.Value.OutputRegisterValue = CVPOperand::OFogCoord; break;
+		case PSIZ: operand.Value.OutputRegisterValue = CVPOperand::OPointSize; break;
+		case TEX0: operand.Value.OutputRegisterValue = CVPOperand::OTex0; break;
+		case TEX1: operand.Value.OutputRegisterValue = CVPOperand::OTex1; break;
+		case TEX2: operand.Value.OutputRegisterValue = CVPOperand::OTex2; break;
+		case TEX3: operand.Value.OutputRegisterValue = CVPOperand::OTex3; break;
+		case TEX4: operand.Value.OutputRegisterValue = CVPOperand::OTex4; break;
+		case TEX5: operand.Value.OutputRegisterValue = CVPOperand::OTex5; break;
+		case TEX6: operand.Value.OutputRegisterValue = CVPOperand::OTex6; break;
+		case TEX7: operand.Value.OutputRegisterValue = CVPOperand::OTex7; break;
 		default:
 			errorOutput = "Can't read index for output register.";
 			return false;
@@ -753,9 +832,9 @@ bool CVPParser::parseInstruction(CVPInstruction &instr, std::string &errorOutput
 	{
 		instrStr |= (uint32) ' ';
 	}
-	switch (instrStr)
+	switch ((TArguments)instrStr)
 	{
-		case 'ARL ':
+		case ARL:
 			instr.Opcode = CVPInstruction::ARL;
 			if (!parseOp2(instr, errorOutput)) return false;
 			if (!instr.Src1.Swizzle.isScalar())
@@ -764,7 +843,7 @@ bool CVPParser::parseInstruction(CVPInstruction &instr, std::string &errorOutput
 				return false;
 			}
 		break;
-		case 'RSQ ':
+		case RSQ:
 			instr.Opcode = CVPInstruction::RSQ;
 			if (!parseOp2(instr, errorOutput)) return false;
 			if (!instr.Src1.Swizzle.isScalar())
@@ -773,8 +852,8 @@ bool CVPParser::parseInstruction(CVPInstruction &instr, std::string &errorOutput
 				return false;
 			}
 		break;
-		case 'EXP ':
-		case 'EXPP':
+		case EXP:
+		case EXPP:
 			instr.Opcode = CVPInstruction::EXPP;
 			if (!parseOp2(instr, errorOutput)) return false;
 			if (!instr.Src1.Swizzle.isScalar())
@@ -789,7 +868,7 @@ bool CVPParser::parseInstruction(CVPInstruction &instr, std::string &errorOutput
 				return false;
 			}*/
 		break;
-		case 'LOG ':
+		case LOG:
 			instr.Opcode = CVPInstruction::LOG;
 			if (!parseOp2(instr, errorOutput)) return false;
 			if (!instr.Src1.Swizzle.isScalar())
@@ -805,7 +884,7 @@ bool CVPParser::parseInstruction(CVPInstruction &instr, std::string &errorOutput
 			}
 			*/
 		break;
-		case 'RCP ':
+		case RCP:
 			instr.Opcode = CVPInstruction::RCP;
 			if (!parseOp2(instr, errorOutput)) return false;
 			if (!instr.Src1.Swizzle.isScalar())
@@ -815,60 +894,60 @@ bool CVPParser::parseInstruction(CVPInstruction &instr, std::string &errorOutput
 			}
 		break;
 		/////////////////
-		case 'MOV ':
+		case MOV:
 			instr.Opcode = CVPInstruction::MOV;
 			if (!parseOp2(instr, errorOutput)) return false;
 
 		break;
-		case 'LIT ':
+		case LIT:
 			instr.Opcode = CVPInstruction::LIT;
 			if (!parseOp2(instr, errorOutput)) return false;
 		break;
 		/////////////////
-		case 'MAD ':
+		case MAD:
 			instr.Opcode = CVPInstruction::MAD;
 			if (!parseOp4(instr, errorOutput)) return false;
 		break;
 		/////////////////
-		case 'ADD ':
+		case ADD:
 			instr.Opcode = CVPInstruction::ADD;
 			if (!parseOp3(instr, errorOutput)) return false;
 		break;
 		/////////////////
-		case 'MUL ':
+		case MUL:
 			instr.Opcode = CVPInstruction::MUL;
 			if (!parseOp3(instr, errorOutput)) return false;
 		break;
-		case 'DP3 ':
+		case DP3:
 			instr.Opcode = CVPInstruction::DP3;
 			if (!parseOp3(instr, errorOutput)) return false;
 		break;
-		case 'DP4 ':
+		case DP4:
 			instr.Opcode = CVPInstruction::DP4;
 			if (!parseOp3(instr, errorOutput)) return false;
 		break;
-		case 'DST ':
+		case DST:
 			instr.Opcode = CVPInstruction::DST;
 			if (!parseOp3(instr, errorOutput)) return false;
 		break;
-		case 'MIN ':
+		case MIN:
 			instr.Opcode = CVPInstruction::MIN;
 			if (!parseOp3(instr, errorOutput)) return false;
 		break;
-		case 'MAX ':
+		case MAX:
 			instr.Opcode = CVPInstruction::MAX;
 			if (!parseOp3(instr, errorOutput)) return false;
 		break;
-		case 'SLT ':
+		case SLT:
 			instr.Opcode = CVPInstruction::SLT;
 			if (!parseOp3(instr, errorOutput)) return false;
 		break;
-		case 'SGE ':
+		case SGE:
 			instr.Opcode = CVPInstruction::SGE;
 			if (!parseOp3(instr, errorOutput)) return false;
 		break;
 		/////////////////
-		case 'END ':
+		case END:
 			endEncountered = true;
 			return true;
 		break;
diff --git a/code/nel/src/georges/form_elm.cpp b/code/nel/src/georges/form_elm.cpp
index 658d1d9f6..01e4010e2 100644
--- a/code/nel/src/georges/form_elm.cpp
+++ b/code/nel/src/georges/form_elm.cpp
@@ -231,7 +231,7 @@ bool CFormElm::isAtom () const
 const CType* CFormElm::getType ()
 {
 	warning (false, "getType", "This node is not an atom.");
-	return 0;
+	return NULL;
 }
 
 // ***************************************************************************
diff --git a/code/nel/src/gui/libwww_nel_stream.cpp b/code/nel/src/gui/libwww_nel_stream.cpp
index f6a45cf06..b7e218b30 100644
--- a/code/nel/src/gui/libwww_nel_stream.cpp
+++ b/code/nel/src/gui/libwww_nel_stream.cpp
@@ -21,7 +21,7 @@
 extern "C"
 {
 
-	/* Library Includes */
+/* Library Includes */
 #include "wwwsys.h"
 #include "WWWUtil.h"
 #include "WWWCore.h"
@@ -41,8 +41,9 @@ using namespace NLMISC;
 extern "C"
 {
 
-	/* Final states have negative value */
-typedef enum _FileState {
+/* Final states have negative value */
+typedef enum _FileState
+{
 	FS_RETRY		= -4,
 	FS_ERROR		= -3,
 	FS_NO_DATA		= -2,
@@ -57,26 +58,29 @@ typedef enum _FileState {
 } FileState;
 
 /* This is the context structure for the this module */
-typedef struct _file_info {
-	FileState	state;		  /* Current state of the connection */
-	char *		local;		/* Local representation of file name */
-	struct stat		stat_info;	      /* Contains actual file chosen */
+typedef struct _file_info
+{
+	FileState	state;			/* Current state of the connection */
+	char *		local;			/* Local representation of file name */
+	struct stat		stat_info;	/* Contains actual file chosen */
 	HTNet *		net;
 	HTTimer *	timer;
 } file_info;
 
-struct _HTStream {
+struct _HTStream
+{
 	const HTStreamClass *	isa;
 };
 
-struct _HTInputStream {
+struct _HTInputStream
+{
 	const HTInputStreamClass *	isa;
 	HTChannel *			ch;
 	HTHost *			host;
-	char *			write;			/* Last byte written */
-	char *			read;			   /* Last byte read */
+	char *			write;						/* Last byte written */
+	char *			read;						/* Last byte read */
 	int				b_read;
-	char			data [INPUT_BUFFER_SIZE];	   /* buffer */
+	char			data [INPUT_BUFFER_SIZE];	/* buffer */
 };
 
 PRIVATE int FileCleanup (HTRequest *req, int status)
@@ -96,7 +100,7 @@ PRIVATE int FileCleanup (HTRequest *req, int status)
 	}
 
 	/*
-	**  Remove if we have registered a timer function as a callback
+	** Remove if we have registered a timer function as a callback
 	*/
 	if (file->timer)
 	{
@@ -123,10 +127,8 @@ PUBLIC int HTLoadNeLFile (SOCKET soc, HTRequest * request)
 	HTNet * net = HTRequest_net(request);
 	HTParentAnchor * anchor = HTRequest_anchor(request);
 
-	HTTRACE(PROT_TRACE, "HTLoadFile.. Looking for `%s\'\n" _
-				HTAnchor_physical(anchor));
-	if ((file = (file_info *) HT_CALLOC(1, sizeof(file_info))) == NULL)
-	HT_OUTOFMEM((char*)"HTLoadFILE");
+	HTTRACE(PROT_TRACE, "HTLoadFile.. Looking for `%s\'\n" _ HTAnchor_physical(anchor));
+	if ((file = (file_info *) HT_CALLOC(1, sizeof(file_info))) == NULL) HT_OUTOFMEM("HTLoadFILE");
 	file->state = FS_BEGIN;
 	file->net = net;
 	HTNet_setContext(net, file);
@@ -139,8 +141,8 @@ PUBLIC int HTLoadNeLFile (SOCKET soc, HTRequest * request)
 PRIVATE int ReturnEvent (HTTimer * timer, void * param, HTEventType /* type */)
 {
 	file_info * file = (file_info *) param;
-	if (timer != file->timer)
-	HTDEBUGBREAK((char*)"File timer %p not in sync\n" _ timer);
+	if (timer != file->timer) HTDEBUGBREAK("File timer %p not in sync\n" _ timer);
+
 	HTTRACE(PROT_TRACE, "HTLoadFile.. Continuing %p with timer %p\n" _ file _ timer);
 
 	/*
@@ -163,7 +165,7 @@ PUBLIC int HTNeLFileOpen (HTNet * net, char * local, HTLocalMode /* mode */)
 
 	if (!fp->open (local))
 	{
-		HTRequest_addSystemError(request, ERR_FATAL, errno, NO, (char*)"CIFile::open");
+		HTRequest_addSystemError(request, ERR_FATAL, errno, NO, "CIFile::open");
 		return HT_ERROR;
 	}
 
@@ -186,7 +188,7 @@ PRIVATE int FileEvent (SOCKET /* soc */, void * pVoid, HTEventType type)
 	{
 		/* Interrupted */
 		HTRequest_addError(request, ERR_FATAL, NO, HTERR_INTERRUPTED,
-			NULL, 0, (char*)"HTLoadFile");
+			NULL, 0, "HTLoadFile");
 		FileCleanup(request, HT_INTERRUPTED);
 		return HT_OK;
 	}
@@ -202,7 +204,7 @@ PRIVATE int FileEvent (SOCKET /* soc */, void * pVoid, HTEventType type)
 		/* We only support safe (GET, HEAD, etc) methods for the moment */
 		if (!HTMethod_isSafe(HTRequest_method(request))) {
 		HTRequest_addError(request, ERR_FATAL, NO, HTERR_NOT_ALLOWED,
-				   NULL, 0, (char*)"HTLoadFile");
+				   NULL, 0, "HTLoadFile");
 		file->state = FS_ERROR;
 		break;
 		}
@@ -234,166 +236,188 @@ PRIVATE int FileEvent (SOCKET /* soc */, void * pVoid, HTEventType type)
 
 		/* Create a new host object and link it to the net object */
 		{
-		HTHost * host = NULL;
-		if ((host = HTHost_new((char*)"localhost", 0)) == NULL) return HT_ERROR;
-		HTNet_setHost(net, host);
-		if (HTHost_addNet(host, net) == HT_PENDING) {
-			HTTRACE(PROT_TRACE, "HTLoadFile.. Pending...\n");
-			/* move to the hack state */
-			file->state = FS_PENDING;
-			return HT_OK;
-		}
+			HTHost * host = NULL;
+			if ((host = HTHost_new("localhost", 0)) == NULL) return HT_ERROR;
+			HTNet_setHost(net, host);
+			if (HTHost_addNet(host, net) == HT_PENDING)
+			{
+				HTTRACE(PROT_TRACE, "HTLoadFile.. Pending...\n");
+				/* move to the hack state */
+				file->state = FS_PENDING;
+				return HT_OK;
+			}
 		}
 		file->state = FS_DO_CN;
 		break;
 
 	case FS_PENDING:
 		{
-		HTHost * host = NULL;
-		if ((host = HTHost_new((char*)"localhost", 0)) == NULL) return HT_ERROR;
-		HTNet_setHost(net, host);
-		if (HTHost_addNet(host, net) == HT_PENDING) {
-			HTTRACE(PROT_TRACE, "HTLoadFile.. Pending...\n");
-			file->state = FS_PENDING;
-			return HT_OK;
-		}
+			HTHost * host = NULL;
+			if ((host = HTHost_new((char*)"localhost", 0)) == NULL) return HT_ERROR;
+			HTNet_setHost(net, host);
+			if (HTHost_addNet(host, net) == HT_PENDING)
+			{
+				HTTRACE(PROT_TRACE, "HTLoadFile.. Pending...\n");
+				file->state = FS_PENDING;
+				return HT_OK;
+			}
 		}
 		file->state = FS_DO_CN;
 		break;
 
 	case FS_DO_CN:
 		if (HTRequest_negotiation(request) &&
-		HTMethod_isSafe(HTRequest_method(request))) {
+		HTMethod_isSafe(HTRequest_method(request)))
+		{
+			HTAnchor_setPhysical(anchor, file->local);
+			HTTRACE(PROT_TRACE, "Load File... Found `%s\'\n" _ file->local);
+		}
+		else
+		{
+			if (HT_STAT(file->local, &file->stat_info) == -1)
+			{
+				HTTRACE(PROT_TRACE, "Load File... Not found `%s\'\n" _ file->local);
+				HTRequest_addError(request, ERR_FATAL, NO, HTERR_NOT_FOUND, NULL, 0, "HTLoadFile");
+				file->state = FS_ERROR;
+				break;
+			}
+		}
 
-		HTAnchor_setPhysical(anchor, file->local);
-		HTTRACE(PROT_TRACE, "Load File... Found `%s\'\n" _ file->local);
-
-		} else {
-		if (HT_STAT(file->local, &file->stat_info) == -1) {
-			HTTRACE(PROT_TRACE, "Load File... Not found `%s\'\n" _ file->local);
-			HTRequest_addError(request, ERR_FATAL, NO, HTERR_NOT_FOUND,
-					   NULL, 0, (char*)"HTLoadFile");
-			file->state = FS_ERROR;
+		if (((file->stat_info.st_mode) & S_IFMT) == S_IFDIR)
+		{
+			if (HTRequest_method(request) == METHOD_GET)
+			{
+				file->state = FS_PARSE_DIR;
+			}
+			else
+			{
+				HTRequest_addError(request, ERR_INFO, NO, HTERR_NO_CONTENT, NULL, 0, "HTLoadFile");
+				file->state = FS_NO_DATA;
+			}
 			break;
 		}
-		}
-
-		if (((file->stat_info.st_mode) & S_IFMT) == S_IFDIR) {
-		if (HTRequest_method(request) == METHOD_GET)
-			file->state = FS_PARSE_DIR;
-		else {
-			HTRequest_addError(request, ERR_INFO, NO, HTERR_NO_CONTENT,
-					   NULL, 0, (char*)"HTLoadFile");
-			file->state = FS_NO_DATA;
-		}
-		break;
-		}
 
 		{
-		BOOL editable = FALSE;
-		HTBind_getAnchorBindings(anchor);
-		if (editable) HTAnchor_appendAllow(anchor, METHOD_PUT);
+			BOOL editable = FALSE;
+			HTBind_getAnchorBindings(anchor);
+			if (editable) HTAnchor_appendAllow(anchor, METHOD_PUT);
 
-		/* Set the file size */
-		CIFile nelFile;
-		if (nelFile.open (file->local))
-		{
-			file->stat_info.st_size = nelFile.getFileSize();
-		}
-		nelFile.close();
+			/* Set the file size */
+			CIFile nelFile;
+			if (nelFile.open (file->local))
+			{
+				file->stat_info.st_size = nelFile.getFileSize();
+			}
+			nelFile.close();
 
-		if (file->stat_info.st_size)
-			HTAnchor_setLength(anchor, file->stat_info.st_size);
+			if (file->stat_info.st_size)
+				HTAnchor_setLength(anchor, file->stat_info.st_size);
 
-		/* Set the file last modified time stamp */
-		if (file->stat_info.st_mtime > 0)
-			HTAnchor_setLastModified(anchor, file->stat_info.st_mtime);
+			/* Set the file last modified time stamp */
+			if (file->stat_info.st_mtime > 0)
+				HTAnchor_setLastModified(anchor, file->stat_info.st_mtime);
 
-		/* Check to see if we can edit it */
-		if (!editable && !file->stat_info.st_size) {
-			HTRequest_addError(request, ERR_INFO, NO, HTERR_NO_CONTENT,
-					   NULL, 0, (char*)"HTLoadFile");
-			file->state = FS_NO_DATA;
-		} else {
-			file->state = (HTRequest_method(request)==METHOD_GET) ?
-			FS_NEED_OPEN_FILE : FS_GOT_DATA;
-		}
+			/* Check to see if we can edit it */
+			if (!editable && !file->stat_info.st_size)
+			{
+				HTRequest_addError(request, ERR_INFO, NO, HTERR_NO_CONTENT, NULL, 0, "HTLoadFile");
+				file->state = FS_NO_DATA;
+			}
+			else
+			{
+				file->state = (HTRequest_method(request)==METHOD_GET) ? FS_NEED_OPEN_FILE : FS_GOT_DATA;
+			}
 		}
 		break;
 
 	  case FS_NEED_OPEN_FILE:
 		status = HTNeLFileOpen(net, file->local, HT_FB_RDONLY);
-		if (status == HT_OK) {
+		if (status == HT_OK)
 		{
-			HTStream * rstream = HTStreamStack(HTAnchor_format(anchor),
-							   HTRequest_outputFormat(request),
-							   HTRequest_outputStream(request),
-							   request, YES);
-			HTNet_setReadStream(net, rstream);
-			HTRequest_setOutputConnected(request, YES);
-		}
-
-		{
-			HTOutputStream * output = HTNet_getOutput(net, NULL, 0);
-			HTRequest_setInputStream(request, (HTStream *) output);
-		}
-
-		if (HTRequest_isSource(request) && !HTRequest_destinationsReady(request))
-			return HT_OK;
-		HTRequest_addError(request, ERR_INFO, NO, HTERR_OK, NULL, 0,
-				   (char*)"HTLoadFile");
-		file->state = FS_NEED_BODY;
-
-		if (HTEvent_isCallbacksRegistered()) {
-			if (!HTRequest_preemptive(request)) {
-			if (!HTNet_preemptive(net)) {
-				HTTRACE(PROT_TRACE, "HTLoadFile.. Returning\n");
-				HTHost_register(HTNet_host(net), net, HTEvent_READ);
-			} else if (!file->timer) {
-				HTTRACE(PROT_TRACE, "HTLoadFile.. Returning\n");
-				file->timer =
-				HTTimer_new(NULL, ReturnEvent, file, 1, YES, NO);
+			{
+				HTStream * rstream = HTStreamStack(HTAnchor_format(anchor),
+					HTRequest_outputFormat(request),
+					HTRequest_outputStream(request),
+					request, YES);
+				HTNet_setReadStream(net, rstream);
+				HTRequest_setOutputConnected(request, YES);
 			}
-			return HT_OK;
+
+			{
+				HTOutputStream * output = HTNet_getOutput(net, NULL, 0);
+				HTRequest_setInputStream(request, (HTStream *) output);
+			}
+
+			if (HTRequest_isSource(request) && !HTRequest_destinationsReady(request)) return HT_OK;
+
+			HTRequest_addError(request, ERR_INFO, NO, HTERR_OK, NULL, 0, "HTLoadFile");
+			file->state = FS_NEED_BODY;
+
+			if (HTEvent_isCallbacksRegistered())
+			{
+				if (!HTRequest_preemptive(request))
+				{
+					if (!HTNet_preemptive(net))
+					{
+						HTTRACE(PROT_TRACE, "HTLoadFile.. Returning\n");
+						HTHost_register(HTNet_host(net), net, HTEvent_READ);
+					}
+					else if (!file->timer)
+					{
+						HTTRACE(PROT_TRACE, "HTLoadFile.. Returning\n");
+						file->timer = HTTimer_new(NULL, ReturnEvent, file, 1, YES, NO);
+					}
+					return HT_OK;
+				}
 			}
 		}
-		} else if (status == HT_WOULD_BLOCK || status == HT_PENDING)
-		return HT_OK;
-		else {
-		HTRequest_addError(request, ERR_INFO, NO, HTERR_INTERNAL,
-				   NULL, 0, (char*)"HTLoadFile");
-		file->state = FS_ERROR;		       /* Error or interrupt */
+		else if (status == HT_WOULD_BLOCK || status == HT_PENDING)
+		{
+			return HT_OK;
+		}
+		else
+		{
+			HTRequest_addError(request, ERR_INFO, NO, HTERR_INTERNAL, NULL, 0, "HTLoadFile");
+			file->state = FS_ERROR;		       /* Error or interrupt */
 		}
 		break;
 
-	  case FS_NEED_BODY:
+	case FS_NEED_BODY:
 		status = HTHost_read(HTNet_host(net), net);
 		if (status == HT_WOULD_BLOCK)
-		return HT_OK;
-		else if (status == HT_LOADED || status == HT_CLOSED) {
-		file->state = FS_GOT_DATA;
-		} else {
-		HTRequest_addError(request, ERR_INFO, NO, HTERR_FORBIDDEN,
-				   NULL, 0, (char*)"HTLoadFile");
-		file->state = FS_ERROR;
+		{
+			return HT_OK;
+		}
+		else if (status == HT_LOADED || status == HT_CLOSED)
+		{
+			file->state = FS_GOT_DATA;
+		}
+		else
+		{
+			HTRequest_addError(request, ERR_INFO, NO, HTERR_FORBIDDEN, NULL, 0, "HTLoadFile");
+			file->state = FS_ERROR;
 		}
 		break;
 
 	  case FS_TRY_FTP:
 		{
-		char *url = HTAnchor_physical(anchor);
-		HTAnchor *anchor;
-		char *newname = NULL;
-		StrAllocCopy(newname, "ftp:");
-		if (!strncmp(url, "file:", 5))
-			StrAllocCat(newname, url+5);
-		else
-			StrAllocCat(newname, url);
-		anchor = HTAnchor_findAddress(newname);
-		HTRequest_setAnchor(request, anchor);
-		HT_FREE(newname);
-		FileCleanup(request, HT_IGNORE);
-		return HTLoad(request, YES);
+			char *url = HTAnchor_physical(anchor);
+			HTAnchor *anchor;
+			char *newname = NULL;
+			StrAllocCopy(newname, "ftp:");
+			if (!strncmp(url, "file:", 5))
+			{
+				StrAllocCat(newname, url+5);
+			}
+			else
+			{
+				StrAllocCat(newname, url);
+			}
+			anchor = HTAnchor_findAddress(newname);
+			HTRequest_setAnchor(request, anchor);
+			HT_FREE(newname);
+			FileCleanup(request, HT_IGNORE);
+			return HTLoad(request, YES);
 		}
 		break;
 
@@ -461,7 +485,8 @@ PRIVATE int HTNeLReader_read (HTInputStream * me)
 		{
 			HTAlertCallback * cbf = HTAlert_find(HT_PROG_READ);
 			HTNet_addBytesRead(net, me->b_read);
-			if (cbf) {
+			if (cbf)
+			{
 				int tr = HTNet_bytesRead(net);
 				(*cbf)(net->request, HT_PROG_READ, HT_MSG_NULL, NULL, &tr, NULL);
 			}
@@ -472,18 +497,28 @@ PRIVATE int HTNeLReader_read (HTInputStream * me)
 
 		/* Now push the data down the stream */
 		if ((status = (*net->readStream->isa->put_block)
-			(net->readStream, me->data, me->b_read)) != HT_OK) {
-			if (status == HT_WOULD_BLOCK) {
+			(net->readStream, me->data, me->b_read)) != HT_OK)
+		{
+			if (status == HT_WOULD_BLOCK)
+			{
 				HTTRACE(PROT_TRACE, "ANSI read... Target WOULD BLOCK\n");
 				return HT_WOULD_BLOCK;
-			} else if (status == HT_PAUSE) {
+			}
+			else if (status == HT_PAUSE)
+			{
 				HTTRACE(PROT_TRACE, "ANSI read... Target PAUSED\n");
 				return HT_PAUSE;
-			} else if (status > 0) {	      /* Stream specific return code */
+			}
+			else if (status > 0)
+			{
+				/* Stream specific return code */
 				HTTRACE(PROT_TRACE, "ANSI read... Target returns %d\n" _ status);
 				me->write = me->data + me->b_read;
 				return status;
-			} else {				     /* We have a real error */
+			}
+			else
+			{
+				/* We have a real error */
 				HTTRACE(PROT_TRACE, "ANSI read... Target ERROR\n");
 				return status;
 			}
@@ -506,13 +541,15 @@ PRIVATE int HTNeLReader_close (HTInputStream * me)
 	HTNet * net = HTHost_getReadNet(me->host);
 
 
-	if (net && net->readStream) {
-	if ((status = (*net->readStream->isa->_free)(net->readStream))==HT_WOULD_BLOCK)
-		return HT_WOULD_BLOCK;
-	net->readStream = NULL;
+	if (net && net->readStream)
+	{
+		if ((status = (*net->readStream->isa->_free)(net->readStream))==HT_WOULD_BLOCK) return HT_WOULD_BLOCK;
+		net->readStream = NULL;
 	}
+
 	HTTRACE(STREAM_TRACE, "Socket read. FREEING....\n");
 	HT_FREE(me);
+
 	return status;
 }
 
@@ -540,7 +577,8 @@ PRIVATE int HTNeLReader_free (HTInputStream * me)
 	}
 
 	HTNet * net = HTHost_getReadNet(me->host);
-	if (net && net->readStream) {
+	if (net && net->readStream)
+	{
 		int status = (*net->readStream->isa->_free)(net->readStream);
 		if (status == HT_OK) net->readStream = NULL;
 		return status;
@@ -551,7 +589,8 @@ PRIVATE int HTNeLReader_free (HTInputStream * me)
 PRIVATE int HTNeLReader_abort (HTInputStream * me, HTList * /* e */)
 {
 	HTNet * net = HTHost_getReadNet(me->host);
-	if (net && net->readStream) {
+	if (net && net->readStream)
+	{
 		int status = (*net->readStream->isa->abort)(net->readStream, NULL);
 		if (status != HT_IGNORE) net->readStream = NULL;
 	}
@@ -560,7 +599,7 @@ PRIVATE int HTNeLReader_abort (HTInputStream * me, HTList * /* e */)
 
 PRIVATE const HTInputStreamClass HTNeLReader =
 {
-	(char*)"SocketReader",
+	"SocketReader",
 	HTNeLReader_flush,
 	HTNeLReader_free,
 	HTNeLReader_abort,
@@ -569,20 +608,20 @@ PRIVATE const HTInputStreamClass HTNeLReader =
 	HTNeLReader_consumed
 };
 
-PUBLIC HTInputStream * HTNeLReader_new (HTHost * host, HTChannel * ch,
-					 void * /* param */, int /* mode */)
+PUBLIC HTInputStream * HTNeLReader_new (HTHost * host, HTChannel * ch, void * /* param */, int /* mode */)
 {
-	if (host && ch) {
-	HTInputStream * me = HTChannel_input(ch);
-	if (me == NULL) {
-		if ((me=(HTInputStream *) HT_CALLOC(1, sizeof(HTInputStream))) == NULL)
-		HT_OUTOFMEM((char*)"HTNeLReader_new");
-		me->isa = &HTNeLReader;
-		me->ch = ch;
-		me->host = host;
-		HTTRACE(STREAM_TRACE, "Reader...... Created reader stream %p\n" _ me);
-	}
-	return me;
+	if (host && ch)
+	{
+		HTInputStream * me = HTChannel_input(ch);
+		if (me == NULL)
+		{
+			if ((me=(HTInputStream *) HT_CALLOC(1, sizeof(HTInputStream))) == NULL) HT_OUTOFMEM("HTNeLReader_new");
+			me->isa = &HTNeLReader;
+			me->ch = ch;
+			me->host = host;
+			HTTRACE(STREAM_TRACE, "Reader...... Created reader stream %p\n" _ me);
+		}
+		return me;
 	}
 	return NULL;
 }
diff --git a/code/nel/src/misc/config_file/cf_gramatical.cpp b/code/nel/src/misc/config_file/cf_gramatical.cpp
index c6a50934f..1d8c568b7 100644
--- a/code/nel/src/misc/config_file/cf_gramatical.cpp
+++ b/code/nel/src/misc/config_file/cf_gramatical.cpp
@@ -1499,7 +1499,7 @@ void cf_setVar (NLMISC::CConfigFile::CVar &Var, cf_value Val)
 			switch (Val.Type)
 			{
 			case NLMISC::CConfigFile::CVar::T_REAL:		Var.IntValues.push_back ((int)Val.Real); break;
-			case NLMISC::CConfigFile::CVar::T_STRING:	Var.IntValues.push_back (atoi(Val.String)); break;
+			case NLMISC::CConfigFile::CVar::T_STRING:	{ int val = 0; NLMISC::fromString(Val.String, val); Var.IntValues.push_back(val); break; }
 			default: break;
 			}
 			break;
@@ -1507,7 +1507,7 @@ void cf_setVar (NLMISC::CConfigFile::CVar &Var, cf_value Val)
 			switch (Val.Type)
 			{
 			case NLMISC::CConfigFile::CVar::T_INT:		Var.RealValues.push_back ((double)Val.Int); break;
-			case NLMISC::CConfigFile::CVar::T_STRING:	Var.RealValues.push_back (atof(Val.String)); break;
+			case NLMISC::CConfigFile::CVar::T_STRING:	{ double val = 0.0; NLMISC::fromString(Val.String, val); Var.RealValues.push_back(val); break; }
 			default: break;
 			}
 			break;
diff --git a/code/nel/src/misc/config_file/cf_gramatical.ypp b/code/nel/src/misc/config_file/cf_gramatical.ypp
index 199f3df9a..578bf53bf 100644
--- a/code/nel/src/misc/config_file/cf_gramatical.ypp
+++ b/code/nel/src/misc/config_file/cf_gramatical.ypp
@@ -517,7 +517,7 @@ void cf_setVar (NLMISC::CConfigFile::CVar &Var, cf_value Val)
 			switch (Val.Type)
 			{
 			case NLMISC::CConfigFile::CVar::T_REAL:		Var.IntValues.push_back ((int)Val.Real); break;
-			case NLMISC::CConfigFile::CVar::T_STRING:	Var.IntValues.push_back (atoi(Val.String)); break;
+			case NLMISC::CConfigFile::CVar::T_STRING:	{ int val = 0; NLMISC::fromString(Val.String, val); Var.RealValues.push_back(val); break; }
 			default: break;
 			}
 			break;
@@ -525,7 +525,7 @@ void cf_setVar (NLMISC::CConfigFile::CVar &Var, cf_value Val)
 			switch (Val.Type)
 			{
 			case NLMISC::CConfigFile::CVar::T_INT:		Var.RealValues.push_back ((double)Val.Int); break;
-			case NLMISC::CConfigFile::CVar::T_STRING:	Var.RealValues.push_back (atof(Val.String)); break;
+			case NLMISC::CConfigFile::CVar::T_STRING:	{ double val = 0.0; NLMISC::fromString(Val.String, val); Var.RealValues.push_back(val); break; }
 			default: break;
 			}
 			break;
diff --git a/code/nel/src/misc/config_file/cf_lexical.cpp b/code/nel/src/misc/config_file/cf_lexical.cpp
index 80fd4fd36..8c39112a6 100644
--- a/code/nel/src/misc/config_file/cf_lexical.cpp
+++ b/code/nel/src/misc/config_file/cf_lexical.cpp
@@ -2337,7 +2337,7 @@ YY_RULE_SETUP
 				if (!cf_Ignore)
 				{
 					cflval.Val.Type = T_REAL;
-					cflval.Val.Real = atof (yytext);
+					NLMISC::fromString(yytext, cflval.Val.Real);
 					DEBUG_PRINTF("lex: real '%s' '%f\n", yytext, cflval.Val.Real);
 					return REAL;
 				}
diff --git a/code/nel/src/misc/config_file/config_file.cpp b/code/nel/src/misc/config_file/config_file.cpp
index 6113a7a2c..c969f614d 100644
--- a/code/nel/src/misc/config_file/config_file.cpp
+++ b/code/nel/src/misc/config_file/config_file.cpp
@@ -85,8 +85,12 @@ double CConfigFile::CVar::asDouble (int index) const
 		if (index >= (int)IntValues.size () || index < 0) throw EBadSize (Name, (int)IntValues.size (), index);
 		return (double)IntValues[index];
 	case T_STRING:
+	{
 		if (index >= (int)StrValues.size () || index < 0) throw EBadSize (Name, (int)StrValues.size (), index);
-		return atof(StrValues[index].c_str());
+		double val;
+		NLMISC::fromString(StrValues[index], val);
+		return val;
+	}
 	default:
 		if (index >= (int)RealValues.size () || index < 0) throw EBadSize (Name, (int)RealValues.size (), index);
 		return RealValues[index];
diff --git a/code/nel/tools/3d/panoply_maker/color_modifier.cpp b/code/nel/tools/3d/panoply_maker/color_modifier.cpp
index 3c4b1814d..a55936b7c 100644
--- a/code/nel/tools/3d/panoply_maker/color_modifier.cpp
+++ b/code/nel/tools/3d/panoply_maker/color_modifier.cpp
@@ -70,7 +70,6 @@ void CColorModifier::convertBitmap(NLMISC::CBitmap &destBitmap, const NLMISC::CB
 
 			// blend to the destination by using the mask alpha			
 			result.blendFromui(*dest, result, mask->R);
-			
 
 			/// keep alpha from the source			
 			dest->R = result.R;
@@ -78,7 +77,6 @@ void CColorModifier::convertBitmap(NLMISC::CBitmap &destBitmap, const NLMISC::CB
 			dest->B = result.B;
 			dest->A = src->A;
 
-						
 			++ mask;
 			++ src;
 			++ dest;
diff --git a/code/ryzom/client/src/init.cpp b/code/ryzom/client/src/init.cpp
index 1644f7e2d..6958fe790 100644
--- a/code/ryzom/client/src/init.cpp
+++ b/code/ryzom/client/src/init.cpp
@@ -556,10 +556,9 @@ void checkDriverDepth ()
 
 static std::string replaceApplicationDirToken(const std::string &dir)
 {
-
 #ifdef NL_OS_MAC
 	// if client_default.cfg is not in current directory, and it's not an absolute path, use application default directory
-	if (!CFile::isExists("client_default.cfg") && dir.size()>0 && dir[0]!='/')
+	if (!CFile::isExists("client_default.cfg") && !dir.empty() && dir[0]!='/')
 	{
 		return getAppBundlePath() + "/Contents/Resources/" + dir;
 	}
diff --git a/code/ryzom/client/src/interface_v3/chat_window.cpp b/code/ryzom/client/src/interface_v3/chat_window.cpp
index e74392432..1d4c0516b 100644
--- a/code/ryzom/client/src/interface_v3/chat_window.cpp
+++ b/code/ryzom/client/src/interface_v3/chat_window.cpp
@@ -604,7 +604,11 @@ void CChatGroupWindow::displayMessage(const ucstring &msg, NLMISC::CRGBA col, CC
 						pos = newmsg.find(ucstring("}"));;
 						prefix += " ";
 					}
-					newmsg = newmsg.substr(0, pos + 1) + prefix + newmsg.substr(pos + 1);
+					
+					if (pos == ucstring::npos)
+						newmsg = prefix + newmsg;
+					else
+						newmsg = newmsg.substr(0, pos + 1) + prefix + newmsg.substr(pos + 1);
 
 					// Add dynchannel number and optionally name before text if user channel
 					CCDBNodeLeaf* node = NLGUI::CDBManager::getInstance()->getDbProp("UI:SAVE:CHAT:SHOW_DYN_CHANNEL_NAME_IN_CHAT_CB", false);
@@ -615,7 +619,11 @@ void CChatGroupWindow::displayMessage(const ucstring &msg, NLMISC::CRGBA col, CC
 						STRING_MANAGER::CStringManagerClient::instance()->getDynString(textId, title);
 						prefix = title.empty() ? ucstring("") : ucstring(" ") + title;
 						pos = newmsg.find(ucstring("] "));
-						newmsg = newmsg.substr(0, pos) + prefix + newmsg.substr(pos);
+
+						if (pos == ucstring::npos)
+							newmsg = prefix + newmsg;
+						else
+							newmsg = newmsg.substr(0, pos) + prefix + newmsg.substr(pos);
 					}
 				}
 				break;
diff --git a/code/ryzom/client/src/interface_v3/group_html_webig.cpp b/code/ryzom/client/src/interface_v3/group_html_webig.cpp
index 8ffa25878..680a26273 100644
--- a/code/ryzom/client/src/interface_v3/group_html_webig.cpp
+++ b/code/ryzom/client/src/interface_v3/group_html_webig.cpp
@@ -22,6 +22,7 @@
 #include "../user_entity.h"
 #include "../entities.h"
 #include "interface_manager.h"
+#include "user_agent.h"
 
 // used for login cookie to be sent to the web server
 #include "../net_manager.h"
@@ -157,7 +158,7 @@ struct CWebigNotificationThread : public NLMISC::IRunnable
 		if(!Curl) return;
 		curl_easy_setopt(Curl, CURLOPT_COOKIEFILE, "");
 		curl_easy_setopt(Curl, CURLOPT_NOPROGRESS, 1);
-		curl_easy_setopt(Curl, CURLOPT_USERAGENT, "Ryzom");
+		curl_easy_setopt(Curl, CURLOPT_USERAGENT, getUserAgent().c_str());
 		curl_easy_setopt(Curl, CURLOPT_FOLLOWLOCATION, 1);
 		curl_easy_setopt(Curl, CURLOPT_WRITEFUNCTION, writeDataFromCurl);
 		//nlinfo("ctor CWebigNotificationThread");
diff --git a/code/ryzom/client/src/interface_v3/interface_manager.cpp b/code/ryzom/client/src/interface_v3/interface_manager.cpp
index b89566ecd..6f4f31d14 100644
--- a/code/ryzom/client/src/interface_v3/interface_manager.cpp
+++ b/code/ryzom/client/src/interface_v3/interface_manager.cpp
@@ -2925,7 +2925,7 @@ void CInterfaceManager::initEmotes()
 	CSkillManager		*pSM = CSkillManager::getInstance();
 
 	betaTester = pSM->isTitleUnblocked(CHARACTER_TITLE::FBT);
-	string	previousMind = "";
+	string	previousMind;
 	CGroupSubMenu *pFirstMenu = 0;
 
 	for (list<CEmoteEntry>::const_iterator it = entries.begin(); it != entries.end(); it++)
diff --git a/code/ryzom/client/src/login_patch.cpp b/code/ryzom/client/src/login_patch.cpp
index 5b9a83c83..da94f37d6 100644
--- a/code/ryzom/client/src/login_patch.cpp
+++ b/code/ryzom/client/src/login_patch.cpp
@@ -1068,12 +1068,12 @@ float CPatchManager::getCurrentFileProgress() const
 }
 
 // ****************************************************************************
-void CPatchManager::setRWAccess (const string &filename)
+void CPatchManager::setRWAccess (const string &filename, bool bThrowException)
 {
 	ucstring s = CI18N::get("uiSetAttrib") + " " + filename;
 	setState(true, s);
 
-	if (!NLMISC::CFile::setRWAccess(filename))
+	if (!NLMISC::CFile::setRWAccess(filename) && bThrowException)
 	{
 		s = CI18N::get("uiAttribErr") + " " + filename + " (" + toString(errno) + "," + strerror(errno) + ")";
 		setState(true, s);
@@ -1351,7 +1351,7 @@ void CPatchManager::downloadFileWithCurl (const string &source, const string &de
 		// create the local file
 		if (NLMISC::CFile::fileExists(dest))
 		{
-			setRWAccess(dest);
+			setRWAccess(dest, false);
 			NLMISC::CFile::deleteFile(dest.c_str());
 		}
 		FILE *fp = fopen (dest.c_str(), "wb");
@@ -1492,7 +1492,7 @@ void CPatchManager::decompressFile (const string &filename)
 	}
 
 	string dest = filename.substr(0, filename.size ()-4);
-	setRWAccess(dest);
+	setRWAccess(dest, false);
 	//if(isVerboseLog()) nlinfo("Calling fopen('%s','wb')", dest.c_str());
 	FILE *fp = fopen (dest.c_str(), "wb");
 	if (fp == NULL)
@@ -1566,7 +1566,7 @@ void CPatchManager::applyDate (const string &sFilename, uint32 nDate)
 	{
 //		_utimbuf utb;
 //		utb.actime = utb.modtime = nDate;
-		setRWAccess(sFilename);
+		setRWAccess(sFilename, false);
 		ucstring s = CI18N::get("uiChangeDate") + " " + NLMISC::CFile::getFilename(sFilename) + " " + toString(NLMISC::CFile::getFileModificationDate (sFilename)) +
 						" -> " + toString(nDate);
 		setState(true,s);
@@ -3398,6 +3398,7 @@ bool CPatchManager::extract(const std::string& patchPath,
 			ok = true;
 		}
 	}
+
 	if (!ok)
 	{
 		// nothing to extract
@@ -3407,15 +3408,21 @@ bool CPatchManager::extract(const std::string& patchPath,
 	// extract
 	uint nblab = 0;
 	pPM->deleteFile(updateBatchFilename, false, false);
+
 	FILE *fp = fopen (updateBatchFilename.c_str(), "wt");
+
 	if (fp == 0)
 	{
 		string err = toString("Can't open file '%s' for writing: code=%d %s (error code 29)", updateBatchFilename.c_str(), errno, strerror(errno));
 		throw Exception (err);
 	}
+
+#ifdef NL_OS_WINDOWS
 	fprintf(fp, "@echo off\n");
 	fprintf(fp, "ping 127.0.0.1 -n 7 -w 1000 > nul\n"); // wait
-
+#else
+	// TODO: for Linux and OS X
+#endif
 
 	// Unpack files with category ExtractPath non empty
 	for (uint32 j = 0; j < sourceFilename.size(); ++j)
@@ -3442,21 +3449,32 @@ bool CPatchManager::extract(const std::string& patchPath,
 					string DstPath = CPath::standardizeDosPath(extractPath[j]);
 					string DstName = DstPath + vFilenames[fff];
 					NLMISC::CFile::createDirectoryTree(extractPath[j]);
-					// this file must be moved
 
+					// this file must be moved
+#ifdef NL_OS_WINDOWS
 					fprintf(fp, ":loop%u\n", nblab);
 					fprintf(fp, "attrib -r -a -s -h %s\n", DstName.c_str());
 					fprintf(fp, "del %s\n", DstName.c_str());
 					fprintf(fp, "if exist %s goto loop%u\n", DstName.c_str(), nblab);
 					fprintf(fp, "move %s %s\n", SrcName.c_str(), DstPath.c_str());
+#else
+					// TODO: for Linux and OS X
+#endif
+
 					nblab++;
+
 				}
 			}
 		}
 	}
 
 
+#ifdef NL_OS_WINDOWS
 	fprintf(fp, "start %s %%1 %%2 %%3\n", execName.c_str());
+#else
+	// TODO: for Linux and OS X
+#endif
+
 	fclose(fp);
 
 	if (stopFun)
diff --git a/code/ryzom/client/src/login_patch.h b/code/ryzom/client/src/login_patch.h
index de7351775..565de7da2 100644
--- a/code/ryzom/client/src/login_patch.h
+++ b/code/ryzom/client/src/login_patch.h
@@ -302,7 +302,7 @@ private:
 	/// Read the description of the highest client version file found
 	void				readClientVersionAndDescFile();
 
-	void		setRWAccess (const std::string &filename);
+	void		setRWAccess (const std::string &filename, bool bThrowException=true);
 
 	std::string deleteFile (const std::string &filename, bool bThrowException=true, bool bWarning=true);
 
diff --git a/code/ryzom/client/src/login_progress_post_thread.cpp b/code/ryzom/client/src/login_progress_post_thread.cpp
index bc833fb04..76ce9c2e3 100644
--- a/code/ryzom/client/src/login_progress_post_thread.cpp
+++ b/code/ryzom/client/src/login_progress_post_thread.cpp
@@ -85,7 +85,7 @@ static std::string sizeToHumanStd(uint64 size)
 static std::string getVideoInfoDeviceName()
 {
 	uint64 version;
-	std::string ret = "";
+	std::string ret;
 	bool ok = CSystemInfo::getVideoInfo(ret, version);
 	if (ok)
 	{
diff --git a/code/ryzom/client/src/misc.cpp b/code/ryzom/client/src/misc.cpp
index 9adf00a9a..7e018a576 100644
--- a/code/ryzom/client/src/misc.cpp
+++ b/code/ryzom/client/src/misc.cpp
@@ -920,7 +920,7 @@ std::string getStringCategory(const ucstring &src, ucstring &dest, bool alwaysAd
 
 std::string getStringCategoryIfAny(const ucstring &src, ucstring &dest)
 {
-	std::string colorCode = "";
+	std::string colorCode;
 	if (src.size() >= 3)
 	{
 		uint startPos = 0;
diff --git a/code/ryzom/client/src/net_manager.cpp b/code/ryzom/client/src/net_manager.cpp
index 4b37b698a..0d369fe85 100644
--- a/code/ryzom/client/src/net_manager.cpp
+++ b/code/ryzom/client/src/net_manager.cpp
@@ -4109,7 +4109,7 @@ void	CNetManagerMulti::init( const std::string& cookie, const std::string& addr
 
 //
 uint32					ShardId = 0;
-std::string				WebServer = "";
+std::string				WebServer;
 
 
 
diff --git a/code/ryzom/client/src/r2/displayer_visual_entity.cpp b/code/ryzom/client/src/r2/displayer_visual_entity.cpp
index 37632f4d4..5bc8638f0 100644
--- a/code/ryzom/client/src/r2/displayer_visual_entity.cpp
+++ b/code/ryzom/client/src/r2/displayer_visual_entity.cpp
@@ -564,7 +564,7 @@ void CDisplayerVisualEntity::updateWorldMapPresence()
 				_MapDeco.setDisplayedInstance(getDisplayedInstance(), true);
 				// retrieve icon from the displayed object (lua code)
 				CLuaState &ls = getEditor().getLua();
-				std::string texName = "";
+				std::string texName;
 				{
 					CLuaStackChecker lsc(&ls);
 					if (getDisplayedInstance()->getLuaProjection().callMethodByNameNoThrow("getSelectBarIcon", 0, 1))
@@ -984,7 +984,7 @@ void CDisplayerVisualEntity::updateName()
 				break;
 			}
 		}
-		std::string firstPart = "";
+		std::string firstPart;
 		if(actNb>0)
 			firstPart = CI18N::get("uiR2EDDefaultActTitle").toString() + " " + NLMISC::toString(actNb);
 
diff --git a/code/ryzom/client/src/r2/dmc/client_edition_module.cpp b/code/ryzom/client/src/r2/dmc/client_edition_module.cpp
index 0a5f74cc5..93978800d 100644
--- a/code/ryzom/client/src/r2/dmc/client_edition_module.cpp
+++ b/code/ryzom/client/src/r2/dmc/client_edition_module.cpp
@@ -1116,12 +1116,12 @@ void CClientEditionModule::startingScenario(class NLNET::IModuleProxy * /* serve
 
 
 		uint32 myUserId = NetMngr.getUserId();
-		std::string connectionState = "";
+		std::string connectionState;
 
 		if (myUserId == (charId>>4) || ClientCfg.Local)
 		{
 
-			std::string errorMsg = "";
+			std::string errorMsg;
 
 			CObject* hlScenario = _Scenario->getHighLevel();
 			hlData.setData(hlScenario); // clone before modify by translateFeatures
@@ -2425,10 +2425,10 @@ bool CClientEditionModule::addToLoadList( const std::string& filename, CScenario
 void CClientEditionModule::loadScenarioSucceded(const std::string& filename, const std::string& body, const CScenarioValidator::TValues& values)
 {
 	//H_AUTO(R2_CClientEditionModule_loadScenarioSucceded)
-	string initialIsland="", initialEntryPoint="", initialSeason = "";
-	string creatorMD5 = "", modifiedByMD5="";
-	string name = "";
-	string locked = "";
+	string initialIsland, initialEntryPoint, initialSeason;
+	string creatorMD5, modifiedByMD5;
+	string name;
+	string locked;
 	for(uint i=0; i<values.size(); i++)
 	{
 		const std::pair<std::string, std::string>& pair = values[i];
diff --git a/code/ryzom/client/src/r2/dmc/com_lua_module.cpp b/code/ryzom/client/src/r2/dmc/com_lua_module.cpp
index c9b6a6df2..b73813786 100644
--- a/code/ryzom/client/src/r2/dmc/com_lua_module.cpp
+++ b/code/ryzom/client/src/r2/dmc/com_lua_module.cpp
@@ -834,7 +834,7 @@ sint CComLuaModule::luaRequestEraseNode(lua_State* state)
 	if (args>2) { luaL_checknumber(state, 3); }
 
 	std::string instanceId(lua_tostring(state, 1));
-	std::string attrName = "";
+	std::string attrName;
 	sint position = -1;
 	if (args>1){ attrName = lua_tostring(state, 2);}
 	if (args>2){ position = static_cast<sint>(lua_tonumber(state, 3));}
@@ -1255,7 +1255,7 @@ CObject* CComLuaModule::getObjectFromLua(lua_State* state, sint idx)
 			lua_pushnil(state);
 			while (lua_next(state, -2) != 0)
 			{
-				std::string key = "";
+				std::string key;
 				if ( lua_type(state, -2) == LUA_TSTRING)
 				{
 					key = lua_tostring(state, -2);
@@ -1285,7 +1285,7 @@ CObject* CComLuaModule::getObjectFromLua(lua_State* state, sint idx)
 CObject* CComLuaModule::loadLocal(const std::string& filename, const CScenarioValidator::TValues& values)
 {
 	CScenarioValidator::TValues::const_iterator first(values.begin()), last(values.end());
-	std::string name = "";
+	std::string name;
 	for (; first != last; ++first)
 	{
 		if (first->first == "Name" ) { name = first->second; }
@@ -1347,7 +1347,7 @@ bool CComLuaModule::loadUserComponent(const std::string& filename)
 CObject* CComLuaModule::loadFromBuffer(const std::string& data, const std::string& filename, const CScenarioValidator::TValues& values)
 {
 	CScenarioValidator::TValues::const_iterator first(values.begin()), last(values.end());
-	std::string name = "";
+	std::string name;
 	for (; first != last; ++first)
 	{
 		if (first->first == "Name" ) { name = first->second; }
diff --git a/code/ryzom/client/src/r2/dmc/dmc.cpp b/code/ryzom/client/src/r2/dmc/dmc.cpp
index 4642dfa10..0659f0a56 100644
--- a/code/ryzom/client/src/r2/dmc/dmc.cpp
+++ b/code/ryzom/client/src/r2/dmc/dmc.cpp
@@ -267,7 +267,7 @@ void CDynamicMapClient::save(const std::string& /* filename */)
 void CDynamicMapClient::saveRtData(const std::string& filename)
 {
 	//H_AUTO(R2_CDynamicMapClient_saveRtData)
-	std::string name = "";
+	std::string name;
 	name += filename;
 	//std::ostringstream out2;
 	std::string out2;
diff --git a/code/ryzom/client/src/session_browser_impl.h b/code/ryzom/client/src/session_browser_impl.h
index 6235128b0..302da2864 100644
--- a/code/ryzom/client/src/session_browser_impl.h
+++ b/code/ryzom/client/src/session_browser_impl.h
@@ -21,7 +21,6 @@
 #include "session_browser.h"
 #include "game_share/ring_session_manager_itf.h"
 #include "nel/gui/lua_helper.h"
-using namespace NLGUI;
 #include "far_tp.h"
 
 class CSessionBrowserImpl : public CSessionBrowser,
@@ -37,7 +36,7 @@ public:
 	  *              - RingAccessPoint:onConnectionClosed()
 	  *              - RingAccessPoint:onConnectionFailed()
 	  */
-	void init(CLuaState *ls);
+	void init(NLGUI::CLuaState *ls);
 	// from CSessionBrowser
 	virtual void on_connectionFailed();
 	virtual void on_connectionClosed();
@@ -99,17 +98,17 @@ public:
 
 	static const std::string &getFrontEndAddress();
 private:
-	CLuaState::TRefPtr _Lua;
-	static int luaGetRingSessionList(CLuaState &ls);
-	static int luaGetRingCharList(CLuaState &ls);
-	static int luaJoinRingSession(CLuaState &ls);
-	static int luaCheckRingAccess(CLuaState &ls);
-	static int luaGetFileHeader(CLuaState &ls);
-	static int luaGetRingStats(CLuaState &ls);
-	static int luaGetScenarioScores(CLuaState &ls);
-	static int luaUpdateScenarioScores(CLuaState &ls);
-	static int luaGetSessionAverageScores(CLuaState &ls);
-	static int luaGetScenarioAverageScores(CLuaState &ls);
+	NLGUI::CLuaState::TRefPtr _Lua;
+	static int luaGetRingSessionList(NLGUI::CLuaState &ls);
+	static int luaGetRingCharList(NLGUI::CLuaState &ls);
+	static int luaJoinRingSession(NLGUI::CLuaState &ls);
+	static int luaCheckRingAccess(NLGUI::CLuaState &ls);
+	static int luaGetFileHeader(NLGUI::CLuaState &ls);
+	static int luaGetRingStats(NLGUI::CLuaState &ls);
+	static int luaGetScenarioScores(NLGUI::CLuaState &ls);
+	static int luaUpdateScenarioScores(NLGUI::CLuaState &ls);
+	static int luaGetSessionAverageScores(NLGUI::CLuaState &ls);
+	static int luaGetScenarioAverageScores(NLGUI::CLuaState &ls);
 	// Call a method inside the 'RingAccessPoint' lua table
 	void callRingAccessPointMethod(const char *name, int numArg, int numResult);
 	void callRingCharTrackingMethod(const char *name, int numArg, int numResult);
diff --git a/code/ryzom/server/src/admin_modules/CMakeLists.txt b/code/ryzom/server/src/admin_modules/CMakeLists.txt
index ea8d8a5ff..9809b2f29 100644
--- a/code/ryzom/server/src/admin_modules/CMakeLists.txt
+++ b/code/ryzom/server/src/admin_modules/CMakeLists.txt
@@ -11,4 +11,8 @@ NL_ADD_LIB_SUFFIX(ryzom_adminmodules)
 
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
+IF(WITH_PCH)
+  ADD_NATIVE_PRECOMPILED_HEADER(ryzom_adminmodules ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp)
+ENDIF(WITH_PCH)
+
 INSTALL(TARGETS ryzom_adminmodules LIBRARY DESTINATION ${RYZOM_LIB_PREFIX} ARCHIVE DESTINATION ${RYZOM_LIB_PREFIX} COMPONENT libraries)
diff --git a/code/ryzom/server/src/admin_modules/admin_modules_itf.cpp b/code/ryzom/server/src/admin_modules/admin_modules_itf.cpp
index 258409d16..39dfc6948 100644
--- a/code/ryzom/server/src/admin_modules/admin_modules_itf.cpp
+++ b/code/ryzom/server/src/admin_modules/admin_modules_itf.cpp
@@ -18,6 +18,7 @@
 // WARNING : this is a generated file, don't change it !
 /////////////////////////////////////////////////////////////////
 
+#include "stdpch.h"
 #include "admin_modules_itf.h"
 
 namespace ADMIN
diff --git a/code/ryzom/server/src/admin_modules/aes_client_module.cpp b/code/ryzom/server/src/admin_modules/aes_client_module.cpp
index e2b9ca390..66dddbe1e 100644
--- a/code/ryzom/server/src/admin_modules/aes_client_module.cpp
+++ b/code/ryzom/server/src/admin_modules/aes_client_module.cpp
@@ -15,6 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+#include "stdpch.h"
 #include "nel/misc/singleton.h"
 #include "nel/net/module.h"
 #include "nel/net/module_builder_parts.h"
diff --git a/code/ryzom/server/src/admin_modules/aes_module.cpp b/code/ryzom/server/src/admin_modules/aes_module.cpp
index c4faf5c47..734dfff64 100644
--- a/code/ryzom/server/src/admin_modules/aes_module.cpp
+++ b/code/ryzom/server/src/admin_modules/aes_module.cpp
@@ -15,6 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+#include "stdpch.h"
 #include "nel/misc/singleton.h"
 #include <time.h>
 #include "nel/misc/path.h"
@@ -573,7 +574,7 @@ namespace ADMIN
 						time_t t = now;
 						fprintf(fp, "AESReportDate=%s", ::ctime(&t));
 
-						fprintf(fp, "NBService=%u\n", _ServiceStates.size());
+						fprintf(fp, "NBService=%u\n", (uint)_ServiceStates.size());
 						// output state of each service
 						TServiceStates::iterator first(_ServiceStates.begin()), last(_ServiceStates.end());
 						for (; first != last; ++first)
diff --git a/code/ryzom/server/src/admin_modules/as_module.cpp b/code/ryzom/server/src/admin_modules/as_module.cpp
index cbe1b2818..9717da358 100644
--- a/code/ryzom/server/src/admin_modules/as_module.cpp
+++ b/code/ryzom/server/src/admin_modules/as_module.cpp
@@ -14,6 +14,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+#include "stdpch.h"
 #include "nel/misc/types_nl.h"
 #include <time.h>
 #include "nel/misc/file.h"
diff --git a/code/ryzom/server/src/ai_service/ai_bot_npc.cpp b/code/ryzom/server/src/ai_service/ai_bot_npc.cpp
index cb183850e..8a7518709 100644
--- a/code/ryzom/server/src/ai_service/ai_bot_npc.cpp
+++ b/code/ryzom/server/src/ai_service/ai_bot_npc.cpp
@@ -714,9 +714,12 @@ void CBotNpc::sendVPA()	// alternate VPA
 
 void CBotNpc::sendVisualProperties()	// VisualPropertyA, B, C
 {
-	CMirrors::setVisualPropertyA( getSpawn()->dataSetRow(), _VisualPropertyA );
-	CMirrors::setVisualPropertyB( getSpawn()->dataSetRow(), _VisualPropertyB );
-	CMirrors::setVisualPropertyC( getSpawn()->dataSetRow(), _VisualPropertyC );
+	if (getSpawn())
+	{
+		CMirrors::setVisualPropertyA( getSpawn()->dataSetRow(), _VisualPropertyA );
+		CMirrors::setVisualPropertyB( getSpawn()->dataSetRow(), _VisualPropertyB );
+		CMirrors::setVisualPropertyC( getSpawn()->dataSetRow(), _VisualPropertyC );
+	}
 }
 
 bool CBotNpc::reSpawn(bool sendMessage)
diff --git a/code/ryzom/server/src/ai_service/commands.cpp b/code/ryzom/server/src/ai_service/commands.cpp
index d257d0492..7a4ff6f0d 100644
--- a/code/ryzom/server/src/ai_service/commands.cpp
+++ b/code/ryzom/server/src/ai_service/commands.cpp
@@ -577,10 +577,10 @@ NLMISC_COMMAND(createStaticAIInstance, "Create a new static AIInstance for a giv
 	CUsedContinent &uc = CUsedContinent::instance();
 
 	const	uint32 in = uc.getInstanceForContinent(args[0]);
-	if (in == ~0)
+	if (in == INVALID_AI_INSTANCE)
 	{
 		nlwarning("The continent '%s' is unknow or not active. Can't create instance, FATAL", args[0].c_str());
-		nlassert(in != ~0);
+		nlassert(in != INVALID_AI_INSTANCE);
 //		nlassertex(in != ~0, ("The continent '%s' is unknow or not active. Can't create instance, FATAL", args[0].c_str()));
 	}
 
diff --git a/code/ryzom/server/src/ai_share/aids_messages.h b/code/ryzom/server/src/ai_share/aids_messages.h
index 7ef43817b..734acbec3 100644
--- a/code/ryzom/server/src/ai_share/aids_messages.h
+++ b/code/ryzom/server/src/ai_share/aids_messages.h
@@ -97,16 +97,16 @@ class CMsgAIFeedback : public NLNET::CTransportClass
 public:
 	std::string Message;
 
-	CMsgAIFeedback() 
+	CMsgAIFeedback()
 	{
 	}
 	
-	CMsgAIFeedback(std::string message) 
+	CMsgAIFeedback(const std::string &message)
 	{
 		Message=message;
 	}
 
-	CMsgAIFeedback(char *msgStr) 
+	CMsgAIFeedback(const char *msgStr)
 	{
 		Message=std::string(msgStr);
 	}
@@ -120,6 +120,5 @@ public:
 	virtual void callback (const std::string &name, NLNET::TServiceId id);
 };
 
-
 #endif
 
diff --git a/code/ryzom/server/src/ai_share/primitive_parser.cpp b/code/ryzom/server/src/ai_share/primitive_parser.cpp
index 892120902..dd52b4d7a 100644
--- a/code/ryzom/server/src/ai_share/primitive_parser.cpp
+++ b/code/ryzom/server/src/ai_share/primitive_parser.cpp
@@ -4176,7 +4176,7 @@ NLMISC_COMMAND(loadMap,"load a complete set of primitive files","<map name>")
 		// check that the continent is active
 		CUsedContinent &uc = CUsedContinent::instance();
 		uint32 in = uc.getInstanceForContinent(continentName);
-		if (in == ~0)
+		if (in == INVALID_AI_INSTANCE)
 		{
 			log.displayNL("loadMap : while loading map '%s', can't load primitive '%s' coz continent '%s' is not active",
 				args[0].c_str(),
@@ -4216,7 +4216,7 @@ NLMISC_COMMAND(unloadMap,"unload a complete set of primitive files","<map name>"
 			// check that the continent is active
 			CUsedContinent &uc = CUsedContinent::instance();
 			uint32 in = uc.getInstanceForContinent(continentName);
-			if (in == ~0)
+			if (in == INVALID_AI_INSTANCE)
 			{
 				log.displayNL("unloadMap : while loading map '%s', can't load primitive '%s' coz continent '%s' is not active",
 					args[0].c_str(),
diff --git a/code/ryzom/server/src/entities_game_service/admin.cpp b/code/ryzom/server/src/entities_game_service/admin.cpp
index 20941e77f..6e06da000 100644
--- a/code/ryzom/server/src/entities_game_service/admin.cpp
+++ b/code/ryzom/server/src/entities_game_service/admin.cpp
@@ -420,7 +420,7 @@ bool getAIInstanceFromGroupName(string& groupName, uint32& instanceNumber)
 	{
 		string continent = groupName.substr(0, groupName.find('@'));
 		uint32 nr = CUsedContinent::instance().getInstanceForContinent(continent);
-		if (nr == ~0)
+		if (nr == INVALID_AI_INSTANCE)
 		{
 			return false;
 		}
diff --git a/code/ryzom/server/src/entities_game_service/game_item_manager/game_item.cpp b/code/ryzom/server/src/entities_game_service/game_item_manager/game_item.cpp
index 30ff4acae..e36a4382e 100644
--- a/code/ryzom/server/src/entities_game_service/game_item_manager/game_item.cpp
+++ b/code/ryzom/server/src/entities_game_service/game_item_manager/game_item.cpp
@@ -242,11 +242,11 @@ float CItemCraftParameters::getCraftParameterValue( RM_FABER_STAT_TYPE::TRMStatT
 		case RM_FABER_STAT_TYPE::ShockWaveProtection:
 		case RM_FABER_STAT_TYPE::PoisonProtection:
 		case RM_FABER_STAT_TYPE::ElectricityProtection:
-			if (Protection1 == statType)
+			if (Protection1 == (PROTECTION_TYPE::TProtectionType)statType)
 				return Protection1Factor;
-			else if (Protection2 == statType)
+			else if (Protection2 == (PROTECTION_TYPE::TProtectionType)statType)
 				return Protection2Factor;
-			else if (Protection3 == statType)
+			else if (Protection3 == (PROTECTION_TYPE::TProtectionType)statType)
 				return Protection3Factor;
 			else return 0.0f;
 		case RM_FABER_STAT_TYPE::DesertResistance:
diff --git a/code/ryzom/server/src/entities_game_service/zone_manager.cpp b/code/ryzom/server/src/entities_game_service/zone_manager.cpp
index dd9e817b1..f55222dca 100644
--- a/code/ryzom/server/src/entities_game_service/zone_manager.cpp
+++ b/code/ryzom/server/src/entities_game_service/zone_manager.cpp
@@ -201,7 +201,7 @@ bool CTpSpawnZone::build(const NLLIGO::CPrimPoint * point)
 			nlwarning("<CTpSpawnZone build> : no z in CTpSpawnZone '%s'",_Name.c_str() );
 			return false;
 		}
-		Point.z = ( float ) atof( value.c_str() );
+		NLMISC::fromString(value, Point.z);
 		Point.z = float( sint32 (1000.0f* Point.z) );
 	}
 	else
diff --git a/code/ryzom/server/src/input_output_service/string_manager_parser.cpp b/code/ryzom/server/src/input_output_service/string_manager_parser.cpp
index 67ce62f10..0cbfbf595 100644
--- a/code/ryzom/server/src/input_output_service/string_manager_parser.cpp
+++ b/code/ryzom/server/src/input_output_service/string_manager_parser.cpp
@@ -650,7 +650,7 @@ bool CStringManager::parseBlock(const ucstring &block, CPhrase &phrase)
 					&& (first - clause.String.begin()) == (sint) clause.Replacements[repCount].InsertPlace)
 				{
 					// check parameter type
-					char *subst;
+					const char *subst;
 					uint paramIndex = clause.Replacements[repCount].ParamIndex;
 
 					TParamId &paramId = phrase.Params[paramIndex]->ParamId;
diff --git a/code/ryzom/server/src/persistant_data_service/pds_database.cpp b/code/ryzom/server/src/persistant_data_service/pds_database.cpp
index 66b272d5c..84148220b 100644
--- a/code/ryzom/server/src/persistant_data_service/pds_database.cpp
+++ b/code/ryzom/server/src/persistant_data_service/pds_database.cpp
@@ -905,14 +905,16 @@ bool	CDatabase::set(RY_PDS::TTableIndex table, RY_PDS::TRowIndex row, RY_PDS::TC
 
 	case PDS_float:
 		{
-			float	data = (float)atof(value.c_str());
+			float data;
+			NLMISC::fromString(value, data);
 			return set(table, row, column, sizeof(data), &data);
 		}
 		break;
 
 	case PDS_double:
 		{
-			double	data = (double)atof(value.c_str());
+			double data;
+			NLMISC::fromString(value, data);
 			return set(table, row, column, sizeof(data), &data);
 		}
 		break;
diff --git a/code/ryzom/server/src/server_share/used_continent.cpp b/code/ryzom/server/src/server_share/used_continent.cpp
index 01ab2beda..9d2b48f0d 100644
--- a/code/ryzom/server/src/server_share/used_continent.cpp
+++ b/code/ryzom/server/src/server_share/used_continent.cpp
@@ -17,8 +17,9 @@
 
 
 #include "stdpch.h"
-#include <nel/net/service.h>
 #include "used_continent.h"
+#include "nel/net/service.h"
+
 
 using namespace std;
 using namespace NLMISC;
@@ -105,7 +106,7 @@ uint32	CUsedContinent::getInstanceForContinent(const std::string &continentName)
 	if (it != _Continents.end())
 		return it->ContinentInstance;
 	else
-		return ~0;
+		return INVALID_AI_INSTANCE;
 }
 
 uint32	CUsedContinent::getInstanceForContinent(CONTINENT::TContinent continentEnum) const
@@ -115,7 +116,7 @@ uint32	CUsedContinent::getInstanceForContinent(CONTINENT::TContinent continentEn
 	if (it != _Continents.end())
 		return it->ContinentInstance;
 	else
-		return ~0;
+		return INVALID_AI_INSTANCE;
 }
 
 const std::string &CUsedContinent::getContinentForInstance(uint32 instanceNumber) const