diff --git a/neo/cm/CollisionModel_load.cpp b/neo/cm/CollisionModel_load.cpp
index b389199b..56f07e5d 100644
--- a/neo/cm/CollisionModel_load.cpp
+++ b/neo/cm/CollisionModel_load.cpp
@@ -3653,7 +3653,7 @@ cm_model_t* idCollisionModelManagerLocal::LoadBinaryModelFromFile( idFile* file,
 	assert( model->polygonRefBlocks == NULL || ( model->polygonRefBlocks->next == NULL && model->polygonRefBlocks->nextRef == NULL ) );
 
 	// RB: FIXME
-#if !defined(__x86_64__) && !defined(_WIN64) && !defined(__PPC64__)
+#if !defined(__x86_64__) && !defined(_WIN64) && !defined(__PPC64__) && !defined(__e2k__) && !defined(__aarch64__) && !(defined(__mips64) || defined(__mips64_))
 	assert( model->polygonBlock->bytesRemaining == 0 );
 	assert( model->brushBlock->bytesRemaining == 0 );
 #endif
diff --git a/neo/idlib/sys/sys_defines.h b/neo/idlib/sys/sys_defines.h
index b9dd6f5e..2e5a1b3a 100644
--- a/neo/idlib/sys/sys_defines.h
+++ b/neo/idlib/sys/sys_defines.h
@@ -117,10 +117,14 @@ If you have questions concerning this license or the applicable additional terms
 			#define CPUSTRING						"e2k"
 		#elif defined(__aarch64__) || defined(__ARM64__) || defined(_M_ARM64)
 			#define CPUSTRING 						"aarch64"
-		#elif defined(__powerpc64__)
+		#elif defined(__powerpc64__) || defined(__PPC64__)
 			#define CPUSTRING						"ppc64"
 		#elif defined(__mips64) || defined(__mips64_)
 			#define CPUSTRING						"mips64"
+		#elif defined(__riscv__) || defined(__riscv)
+			#define CPUSTRING						"riscv"
+		#elif defined(__sparc__) || defined(__sparc)
+			#define CPUSTRING						"sparc"
 		#else
 			#error unknown CPU
 		#endif