diff --git a/r5dev/mathlib/bitvec.h b/r5dev/mathlib/bitvec.h
index 3fec8969..cbd1a8e8 100644
--- a/r5dev/mathlib/bitvec.h
+++ b/r5dev/mathlib/bitvec.h
@@ -457,10 +457,10 @@ template <typename BITCOUNTTYPE>
 inline CVarBitVecBase<BITCOUNTTYPE>::CVarBitVecBase(int numBits)
 {
 	Assert( numBits );
-	m_numBits	= numBits;
+	m_numBits	= BITCOUNTTYPE( numBits );
 
 	// Figure out how many ints are needed
-	m_numInts = CalcNumIntsForBits( numBits );
+	m_numInts = BITCOUNTTYPE( CalcNumIntsForBits( numBits ) );
 	m_pInt = NULL;
 	AllocInts( m_numInts );
 }
diff --git a/r5dev/tier1/bitbuf.cpp b/r5dev/tier1/bitbuf.cpp
index a238ea5d..3c0e84f5 100644
--- a/r5dev/tier1/bitbuf.cpp
+++ b/r5dev/tier1/bitbuf.cpp
@@ -454,6 +454,8 @@ inline void	bf_write::WriteOneBitAt(int iBit, int nValue)
 		}
 	}
 	Assert(numbits >= 0 && numbits <= 32);
+#else
+	NOTE_UNUSED(bCheckRange);
 #endif
 
 	// Bounds checking..