diff --git a/indra/llcommon/llstringtable.cpp b/indra/llcommon/llstringtable.cpp
index d47eb01bd344b29e1ed25e4e0fe19055a797ce4c..83b5a971af4e6c4f39809e7f80e5ee22ebefa422 100644
--- a/indra/llcommon/llstringtable.cpp
+++ b/indra/llcommon/llstringtable.cpp
@@ -49,24 +49,24 @@ LLStringTableEntry::~LLStringTableEntry()
 	mCount = 0;
 }
 
-LLStringTable::LLStringTable(int tablesize)
+LLStringTable::LLStringTable(U32 tablesize)
 : mUniqueEntries(0)
 {
-	S32 i;
+	U32 i;
 	if (!tablesize)
-		tablesize = 4096; // some arbitrary default
+		tablesize = 4096U; // some arbitrary default
 	// Make sure tablesize is power of 2
-	for (i = 31; i>0; i--)
-	{
-		if (tablesize & (1<<i))
-		{
-			if (tablesize >= (3<<(i-1)))
-				tablesize = (1<<(i+1));
-			else
-				tablesize = (1<<i);
-			break;
-		}
-	}
+    for (i = 31U; i > 0U; i--)
+    {
+        if (tablesize & (1U << i))
+        {
+            if (tablesize >= (3U << (i - 1U)))
+                tablesize = (1U << (i + 1U));
+            else
+                tablesize = (1<<i);
+            break;
+        }
+    }
 	mMaxEntries = tablesize;
 
 #if !STRING_TABLE_HASH_MAP
@@ -85,7 +85,7 @@ LLStringTable::~LLStringTable()
 #if !STRING_TABLE_HASH_MAP
 	if (mStringList)
 	{
-		for (S32 i = 0; i < mMaxEntries; i++)
+		for (U32 i = 0; i < mMaxEntries; i++)
 		{
 			if (mStringList[i])
 			{
@@ -106,7 +106,7 @@ LLStringTable::~LLStringTable()
 }
 
 
-static U32 hash_my_string(const char *str, int max_entries)
+static U32 hash_my_string(const char *str, U32 max_entries)
 {
 	U32 retval = 0;
 #if 0
diff --git a/indra/llcommon/llstringtable.h b/indra/llcommon/llstringtable.h
index ff09e7167719e5882ec6321465376b174cecce9b..e17948cf597156c5c7b2587e0b6a33a0d639e412 100644
--- a/indra/llcommon/llstringtable.h
+++ b/indra/llcommon/llstringtable.h
@@ -60,7 +60,7 @@ class LL_COMMON_API LLStringTableEntry
 class LL_COMMON_API LLStringTable
 {
 public:
-	LLStringTable(int tablesize);
+	LLStringTable(U32 tablesize);
 	~LLStringTable();
 
 	char *checkString(const char *str);
@@ -74,7 +74,7 @@ class LL_COMMON_API LLStringTable
 	LLStringTableEntry *addStringEntry(const std::string& str);
 	void  removeString(const char *str);
 
-	S32 mMaxEntries;
+	U32 mMaxEntries;
 	S32 mUniqueEntries;
 	
 #if STRING_TABLE_HASH_MAP
diff --git a/indra/llvfs/llvfs.cpp b/indra/llvfs/llvfs.cpp
index 065cc7e0ed7f0945ab789421f107d6aa966d3575..e07a7d9d33d9f32e0362b86e2b58c69d8f33bdc3 100644
--- a/indra/llvfs/llvfs.cpp
+++ b/indra/llvfs/llvfs.cpp
@@ -2120,9 +2120,10 @@ time_t LLVFS::creationTime()
     int errors = LLFile::stat(mDataFilename, &data_file_stat);
     if (0 == errors)
     {
-        time_t creation_time = data_file_stat.st_ctime;
 #if LL_DARWIN
-        creation_time = data_file_stat.st_birthtime;
+        time_t creation_time = data_file_stat.st_birthtime;
+#else
+        time_t creation_time = data_file_stat.st_ctime;
 #endif
         return creation_time;
     }
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index f1b7e7b021672b2867dfede5858668a36f94d71d..2563f9ef39f65a7ddc29d44889b48bed5c38f9c6 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -3349,9 +3349,7 @@ std::string LLAppViewer::getViewerInfoString(bool default_string) const
 	}
 	support << "\n" << LLTrans::getString("AboutOGL", args, default_string);
 	support << "\n\n" << LLTrans::getString("AboutSettings", args, default_string);
-#if LL_DARWIN
-	support << "\n" << LLTrans::getString("AboutOSXHiDPI", args, default_string);
-#endif
+
 	support << "\n\n" << LLTrans::getString("AboutLibs", args, default_string);
 	if (info.has("COMPILER"))
 	{