diff --git a/indra/llcommon/llframetimer.h b/indra/llcommon/llframetimer.h
index 7f61861072e75db2c861babbf1e55533a39d2ebd..d64009440c3d50024d992090797b11fa4735dad1 100755
--- a/indra/llcommon/llframetimer.h
+++ b/indra/llcommon/llframetimer.h
@@ -52,7 +52,7 @@ class LL_COMMON_API LLFrameTimer
 	// Return a low precision usec since epoch
 	static U64 getTotalTime()
 	{
-		return sTotalTime ? sTotalTime : totalTime();
+		return sTotalTime ? LLUnitImplicit<U64, LLUnits::Microseconds>(sTotalTime) : totalTime();
 	}
 
 	// Return a low precision seconds since epoch
diff --git a/indra/llcommon/llrefcount.h b/indra/llcommon/llrefcount.h
index 3e472d07662a7768383fb3bcb76f3f52a6701642..3d59e48f74532d34b91bc74794d074fdbc66be64 100755
--- a/indra/llcommon/llrefcount.h
+++ b/indra/llcommon/llrefcount.h
@@ -62,7 +62,7 @@ class LL_COMMON_API LLRefCount
 	inline S32 unref() const
 	{
 		llassert(mRef >= 1);
-		if (0 == --mRef) 
+		if (0 == --mRef)
 		{
 			delete this; 
 			return 0;
diff --git a/indra/llcommon/lltimer.cpp b/indra/llcommon/lltimer.cpp
index 8f5a886a371a242fbc5f5d8580b030ffdafc4ca7..f27c433ee17b3d9a05f1fbfaafbfd3666752204e 100755
--- a/indra/llcommon/lltimer.cpp
+++ b/indra/llcommon/lltimer.cpp
@@ -203,8 +203,6 @@ F64 calc_clock_frequency(unsigned int uiMeasureMSecs)
 	return 1000000.0; // microseconds, so 1 MHz.
 }
 
-const U64 SEC_TO_MICROSEC_U64 = 1000000;
-
 U64 get_clock_count()
 {
 	// Linux clocks are in microseconds