diff --git a/include/bx/inline/spscqueue.inl b/include/bx/inline/spscqueue.inl
index 0c8f130..7d80f07 100644
--- a/include/bx/inline/spscqueue.inl
+++ b/include/bx/inline/spscqueue.inl
@@ -150,7 +150,7 @@ namespace bx
 	template<typename Ty>
 	inline Ty* SpScBlockingUnboundedQueueT<Ty>::pop(int32_t _msecs)
 	{
-		return (Ty*)m_queue.pop();
+		return (Ty*)m_queue.pop(_msecs);
 	}
 
 #endif // BX_CONFIG_SUPPORTS_THREADING
diff --git a/include/bx/macros.h b/include/bx/macros.h
index 8dc35fa..04b6d14 100644
--- a/include/bx/macros.h
+++ b/include/bx/macros.h
@@ -101,8 +101,7 @@
 #	error "Unknown BX_COMPILER_?"
 #endif
 
-// #define BX_STATIC_ASSERT(_condition, ...) static_assert(_condition, "" __VA_ARGS__)
-#define BX_STATIC_ASSERT(_condition, ...) typedef char BX_CONCATENATE(BX_STATIC_ASSERT_, __LINE__)[1][(_condition)] BX_ATTRIBUTE(unused)
+#define BX_STATIC_ASSERT(_condition, ...) static_assert(_condition, "" __VA_ARGS__)
 
 ///
 #define BX_ALIGN_DECL_16(_decl) BX_ALIGN_DECL(16, _decl)
diff --git a/include/bx/semaphore.h b/include/bx/semaphore.h
index 41cff1b..205e979 100644
--- a/include/bx/semaphore.h
+++ b/include/bx/semaphore.h
@@ -34,7 +34,7 @@ namespace bx
 		bool wait(int32_t _msecs = -1);
 
 	private:
-		BX_ALIGN_DECL(16, uint8_t) m_internal[64];
+		BX_ALIGN_DECL(16, uint8_t) m_internal[128];
 	};
 
 } // namespace bx
diff --git a/src/semaphore.cpp b/src/semaphore.cpp
index 3fb2aaa..6e8a8b3 100644
--- a/src/semaphore.cpp
+++ b/src/semaphore.cpp
@@ -146,7 +146,7 @@ namespace bx
 		{
 			result = pthread_cond_timedwait(&si->m_cond, &si->m_mutex, &ts);
 		}
-#		endif // BX_PLATFORM_NACL || BX_PLATFORM_OSX
+#		endif // BX_PLATFORM_
 		bool ok = 0 == result;
 
 		if (ok)