diff --git a/pushbuild.txt b/pushbuild.txt
index d6262800..e941ddca 100644
--- a/pushbuild.txt
+++ b/pushbuild.txt
@@ -49,3 +49,4 @@ IT'S CLOBBERIN' TIME
 vc2005 supremecy
 clobbermonkey
 that thing
+clobber build because amx.h changed (sigh)
diff --git a/sourcepawn/compiler/amx.h b/sourcepawn/compiler/amx.h
index 577afff8..b8de039a 100644
--- a/sourcepawn/compiler/amx.h
+++ b/sourcepawn/compiler/amx.h
@@ -228,7 +228,7 @@ typedef struct tagAMX_NATIVE_INFO {
 
 #define AMX_USERNUM     4
 #define sEXPMAX         19      /* maximum name length for file version <= 6 */
-#define sNAMEMAX        31      /* maximum name length of symbol name */
+#define sNAMEMAX        63      /* maximum name length of symbol name */
 
 typedef struct tagAMX_FUNCSTUB {
   ucell address;
diff --git a/sourcepawn/jit/x86/jit_x86.cpp b/sourcepawn/jit/x86/jit_x86.cpp
index 01cc2018..69f2a854 100644
--- a/sourcepawn/jit/x86/jit_x86.cpp
+++ b/sourcepawn/jit/x86/jit_x86.cpp
@@ -2544,17 +2544,7 @@ bool JITX86::InitializeJIT()
 
 	jit = &writer;
 	
-	/* Build the genarray intrinsic */
-	jit->outbase = NULL;
-	jit->outptr = NULL;
-	WriteIntrinsic_GenArray(jit);
-	m_pJitGenArray = Knight::KE_AllocCode(g_pCodeCache, jit->get_outputpos());
-	jit->outbase = (jitcode_t)m_pJitGenArray;
-	jit->outptr = jit->outbase;
-	WriteIntrinsic_GenArray(jit);
-
 	/* Build the entry point */
-	writer = JitWriter();
 	jit->outbase = NULL;
 	jit->outptr = NULL;
 	Write_Execute_Function(jit);
@@ -2564,6 +2554,16 @@ bool JITX86::InitializeJIT()
 	offs = Write_Execute_Function(jit);
 	m_pJitReturn = (uint8_t *)m_pJitEntry + offs;
 
+	/* Build the genarray intrinsic */
+	writer = JitWriter();
+	jit->outbase = NULL;
+	jit->outptr = NULL;
+	WriteIntrinsic_GenArray(jit);
+	m_pJitGenArray = Knight::KE_AllocCode(g_pCodeCache, jit->get_outputpos());
+	jit->outbase = (jitcode_t)m_pJitGenArray;
+	jit->outptr = jit->outbase;
+	WriteIntrinsic_GenArray(jit);
+
 	return true;
 }
 
diff --git a/tools/buildbot/package.pl b/tools/buildbot/package.pl
index 28b36420..3f60d8be 100755
--- a/tools/buildbot/package.pl
+++ b/tools/buildbot/package.pl
@@ -75,7 +75,7 @@ $ftp_path .= "/$major.$minor";
 
 my ($ftp);
 
-$ftp = Net::FTP->new($ftp_host, Debug => 0) 
+$ftp = Net::FTP->new($ftp_host, Debug => 0, Passive => 0) 
     or die "Cannot connect to host $ftp_host: $@";
 
 $ftp->login($ftp_user, $ftp_pass)