diff --git a/ftk/src/ftk.h b/ftk/src/ftk.h
index 455ba74..dd03ef2 100644
--- a/ftk/src/ftk.h
+++ b/ftk/src/ftk.h
@@ -180,7 +180,11 @@
 			typedef int									FLMINT32;
 			typedef short								FLMINT16;
 			typedef signed char						FLMINT8;
-			typedef char *								f_va_list;
+			#if defined( FLM_GNUC)
+				typedef __builtin_va_list			f_va_list;
+			#else
+				typedef char *							f_va_list;
+			#endif
 
 			#if defined( FLM_64BIT) || defined( FLM_OSX) || \
 				 defined( FLM_S390) || defined( FLM_HPUX) || defined( FLM_AIX)
@@ -2350,15 +2354,15 @@
 		const char *		pszSrc,
 		FLMSIZET				uiLength);
 		
-	const char * FLMAPI f_strchr(
+	char * FLMAPI f_strchr(
 		const char *		pszStr,
 		unsigned char		ucByte);
 
-	const char * FLMAPI f_strrchr(
+	char * FLMAPI f_strrchr(
 		const char *		pszStr,
 		unsigned char		ucByte);
 		
-	const char * FLMAPI f_strstr(
+	char * FLMAPI f_strstr(
 		const char *		pszStr,
 		const char *		pszSearch);
 		
diff --git a/ftk/src/ftklog.cpp b/ftk/src/ftklog.cpp
index bca01d8..7035c05 100644
--- a/ftk/src/ftklog.cpp
+++ b/ftk/src/ftklog.cpp
@@ -100,7 +100,7 @@ FSTATIC void f_logProcessFormatString(
 	{
 		f_logStringFormatter( 0, uiLen, uiLen, 0, pLogMessage, &args);
 	}
-	f_va_end(args);
+	f_va_end( args);
 }
 
 /****************************************************************************
diff --git a/ftk/src/ftksys.h b/ftk/src/ftksys.h
index 38853ac..8ef2f96 100644
--- a/ftk/src/ftksys.h
+++ b/ftk/src/ftksys.h
@@ -685,7 +685,7 @@
 		#elif defined( FLM_UNIX)
 			return( posix_atomic_add_32( piTarget, 1));
 		#else
-			#error Atomic operations aren't supported
+			#error Atomic operations are not supported
 		#endif
 	}
 	
@@ -730,7 +730,7 @@
 		#elif defined( FLM_UNIX)
 			return( posix_atomic_add_32( piTarget, -1));
 		#else
-			#error Atomic operations aren't supported
+			#error Atomic operations are not supported
 		#endif
 	}
 	
@@ -804,7 +804,7 @@
 		#elif defined( FLM_UNIX)
 			return( posix_atomic_xchg_32( piTarget, i32NewVal));
 		#else
-			#error Atomic operations aren't supported
+			#error Atomic operations are not supported
 		#endif
 	}
 
diff --git a/ftk/src/ftkunix.cpp b/ftk/src/ftkunix.cpp
index 82f9cc7..3378c5a 100644
--- a/ftk/src/ftkunix.cpp
+++ b/ftk/src/ftkunix.cpp
@@ -41,10 +41,16 @@
 
 #include <fcntl.h>
 
+extern FLMBOOL		gv_bOkToDoAsyncWrites;
+
 #if defined( FLM_SOLARIS)
 	#include <sys/statvfs.h>
 #elif defined( FLM_LINUX)
 	#include <sys/vfs.h>
+
+	extern FLMUINT		gv_uiLinuxMajorVer;
+	extern FLMUINT		gv_uiLinuxMinorVer;
+	extern FLMUINT		gv_uiLinuxRevision;
 #elif defined( FLM_OSF)
 
 	// Tru64 4.0 does not have this declaration. Tru64 5.0 renames statfs
@@ -189,29 +195,29 @@ RCODE F_FileHdl::openOrCreate(
 			else
 			{
 #if defined( FLM_LINUX)
-//				FLMUINT		uiMajor = gv_XFlmSysData.uiLinuxMajorVer;
-//				FLMUINT		uiMinor = gv_XFlmSysData.uiLinuxMinorVer;
-//				FLMUINT		uiRevision = gv_XFlmSysData.uiLinuxRevision;
+				FLMUINT		uiMajor = gv_uiLinuxMajorVer;
+				FLMUINT		uiMinor = gv_uiLinuxMinorVer;
+				FLMUINT		uiRevision = gv_uiLinuxRevision;
 																																														
 				if( uiMajor > 2 || (uiMajor == 2 && uiMinor > 6) ||
 					(uiMajor == 2 && uiMinor == 6 && uiRevision >= 5))
 				{
 					openFlags |= O_DIRECT;
 					
-//					if( gv_XFlmSysData.bOkToDoAsyncWrites)
-//					{
-//						m_bCanDoAsync = TRUE;
-//					}
+					if( gv_bOkToDoAsyncWrites)
+					{
+						m_bCanDoAsync = TRUE;
+					}
 				}
 				else
 				{
 					bDoDirectIO = FALSE;
 				}
 #elif defined( FLM_SOLARIS)
-//				if( gv_XFlmSysData.bOkToDoAsyncWrites)
-//				{
-//					m_bCanDoAsync = TRUE;
-//				}
+				if( gv_bOkToDoAsyncWrites)
+				{
+					m_bCanDoAsync = TRUE;
+				}
 #endif
 			}
 		}
@@ -1324,8 +1330,7 @@ void flmGetLinuxKernelVersion(
 	{
 		goto Exit;
 	}
-	if( (pszVer = (char *)f_strstr( 
-		(FLMBYTE *)szBuffer, (FLMBYTE *)"version ")) == NULL)
+	if( (pszVer = f_strstr( szBuffer, "version ")) == NULL)
 	{
 		goto Exit;
 	}
@@ -1422,8 +1427,7 @@ FINLINE FLMUINT64 flmGetLinuxMemInfoValue(
 	char *			pszTmp;
 	FLMUINT64		ui64Bytes = 0;
 
-	if( (pszTmp = (char *)f_strstr( 
-		(FLMBYTE *)pszMemInfoBuffer, (FLMBYTE *)pszTag)) == NULL)
+	if( (pszTmp = f_strstr( pszMemInfoBuffer, pszTag)) == NULL)
 	{
 		return( 0);
 	}