diff --git a/indra/llcommon/lltrace.h b/indra/llcommon/lltrace.h
index 7694f65441f4032d33249cc8bd85b84b927b645c..ab4ad59e3d71d009366bc38f161eeb99a61b863d 100644
--- a/indra/llcommon/lltrace.h
+++ b/indra/llcommon/lltrace.h
@@ -680,7 +680,8 @@ void* allocAligned(size_t size)
 #elif LL_DARWIN
 		padded_allocation = ll_aligned_malloc(size_with_reserve, ALIGNMENT);
 #else
-		posix_memalign(&padded_allocation, ALIGNMENT, size_with_reserve);
+		if (LL_UNLIKELY(0 != posix_memalign(&padded_allocation, 16, size)))
+			padded_allocation = NULL;
 #endif
 	}
 	return (char*)padded_allocation + aligned_reserve;
diff --git a/indra/newview/llfasttimerview.cpp b/indra/newview/llfasttimerview.cpp
index 32ed66254847c37ffc7cbb95a73332b107280e5c..ba298ed819c87c64f4f5ae22730be75e8e28ee6b 100644
--- a/indra/newview/llfasttimerview.cpp
+++ b/indra/newview/llfasttimerview.cpp
@@ -514,7 +514,7 @@ void LLFastTimerView::draw()
 			else
 			{
 				ms = LLUnit<LLUnits::Seconds, F64>(frame_recording.getPeriodMean(*idp));
-				calls = (S32)frame_recording.getPeriodMean((F32)idp->callCount());
+				calls = (S32)frame_recording.getPeriodMean(idp->callCount());
 			}
 
 			if (mDisplayCalls)