diff --git a/code/qcommon/files.c b/code/qcommon/files.c
index cc667c03..767a1024 100644
--- a/code/qcommon/files.c
+++ b/code/qcommon/files.c
@@ -1403,7 +1403,7 @@ vmInterpret_t FS_FindVM(void **startSearch, char *found, int foundlen, const cha
         
 	while(search)
 	{
-		if(search->dir)
+		if(search->dir && !fs_numServerPaks)
 		{
 			dir = search->dir;
 
diff --git a/code/qcommon/vm.c b/code/qcommon/vm.c
index a790bcc9..3ff5f707 100644
--- a/code/qcommon/vm.c
+++ b/code/qcommon/vm.c
@@ -622,7 +622,8 @@ vm_t *VM_Create( const char *module, intptr_t (*systemCalls)(intptr_t *),
 		interpret = VMI_BYTECODE;
 	}
 #else
-	if ( interpret >= VMI_COMPILED ) {
+	if(interpret != VMI_BYTECODE)
+	{
 		vm->compiled = qtrue;
 		VM_Compile( vm, header );
 	}