diff --git a/public/engine/IEngineService.h b/public/engine/IEngineService.h
index f365715f..b49fdb45 100644
--- a/public/engine/IEngineService.h
+++ b/public/engine/IEngineService.h
@@ -22,6 +22,8 @@ struct EventClientOutput_t
 	EngineLoopState_t m_LoopState;
 	float m_flRenderTime;
 	float m_flRealTime;
+	float m_flRenderFrameTimeUnbounded;
+	bool m_bRenderOnly;
 };
 
 abstract_class IEngineService : public IAppSystem
diff --git a/public/schemasystem/schematypes.h b/public/schemasystem/schematypes.h
index 2f58e30b..a2b3d205 100644
--- a/public/schemasystem/schematypes.h
+++ b/public/schemasystem/schematypes.h
@@ -167,7 +167,7 @@ template <class K, class V>
 class CSchemaPtrMap
 {
 public:
-	CUtlOrderedMap<K, V> m_Map;
+	CUtlOrderedMap<K, V, unsigned short> m_Map;
 	CThreadFastMutex m_Mutex;
 };
 
diff --git a/public/soundflags.h b/public/soundflags.h
index 9b719581..dea37720 100644
--- a/public/soundflags.h
+++ b/public/soundflags.h
@@ -115,7 +115,7 @@ enum soundlevel_t
 //-----------------------------------------------------------------------------
 // Flags to be or-ed together for the iFlags field
 //-----------------------------------------------------------------------------
-enum SoundFlags_t
+enum SoundFlags_t : uint16
 {
 	SOUND_NONE			= 0,			// to keep the compiler happy
 
diff --git a/public/tier1/utlleanvector.h b/public/tier1/utlleanvector.h
index e43c8db9..21074e38 100644
--- a/public/tier1/utlleanvector.h
+++ b/public/tier1/utlleanvector.h
@@ -753,7 +753,7 @@ void CUtlLeanVectorImpl<B, T, I>::DestructElements( T* pElement, const T* pEnd )
 template < class T, class I = short >
 using CUtlLeanVector = CUtlLeanVectorImpl< CUtlLeanVectorBase< T, I >, T, I >;
 
-template < class T, size_t N = 3, class I = short >
+template < class T, size_t N = 3, class I = int >
 using CUtlLeanVectorFixedGrowable = CUtlLeanVectorImpl< CUtlLeanVectorFixedGrowableBase< T, N, I >, T, I >;
 
 #include "tier0/memdbgoff.h"
diff --git a/public/tier1/utlmap.h b/public/tier1/utlmap.h
index a0bd5c7d..170a7d34 100644
--- a/public/tier1/utlmap.h
+++ b/public/tier1/utlmap.h
@@ -201,7 +201,7 @@ protected:
 //-----------------------------------------------------------------------------
 
 // AMNOTE: Currently a stub over CUtlMap, needs a complete implementation
-template <typename K, typename T, typename I = unsigned short, typename LF = CDefLess<K>>
+template <typename K, typename T, typename I = int, typename LF = CDefLess<K>>
 struct CUtlOrderedMap : public CUtlMap<K, T, I, LF>
 {};