diff --git a/core/httpd.c b/core/httpd.c
index 4d0b63c6..2277cc01 100644
--- a/core/httpd.c
+++ b/core/httpd.c
@@ -742,7 +742,7 @@ void ICACHE_FLASH_ATTR httpdRecvCb(ConnTypePtr rconn, char *remIp, int remPort,
 			conn->post->buff[conn->post->buffLen++]=data[x];
 			conn->post->received++;
 			conn->hostName=NULL;
-			if (conn->post->buffLen >= conn->post->buffSize || conn->post->received == conn->post->len) {
+			if (conn->post->buffLen >= conn->post->buffSize || (x+1) == len) {
 				//Received a chunk of post data
 				conn->post->buff[conn->post->buffLen]=0; //zero-terminate, in case the cgi handler knows it can use strings
 				//Process the data
diff --git a/util/cgiflash.c b/util/cgiflash.c
index 1a74c2ed..7db5bee2 100644
--- a/util/cgiflash.c
+++ b/util/cgiflash.c
@@ -30,11 +30,10 @@ Some flash handling cgi routines. Used for updating the ESPFS/OTA image.
 
 // Check that the header of the firmware blob looks like actual firmware...
 static int ICACHE_FLASH_ATTR checkBinHeader(void *buf) {
-	uint8_t *cd = (uint8_t *)buf;
-	if (cd[0] != 0xEA) return 0;
-	if (cd[1] != 4 || cd[2] > 3 || cd[3] > 0x40) return 0;
-	if (((uint16_t *)buf)[3] != 0x4010) return 0;
-	if (((uint32_t *)buf)[2] != 0) return 0;
+	if (*buf != 0xEA) return 0;
+	if (*(buf + 1) != 4 || *(buf + 2) > 3 || *(buf + 3) > 0x60) return 0;
+	if (*(buf + 6) != 0x10 || *(buf + 7) != 0x40) return 0;
+	if (*(buf + 8) != 0 || *(buf + 9) != 0 || *(buf + 10) != 0 || *(buf + 11) != 0) return 0;
 	return 1;
 }
 
@@ -299,4 +298,4 @@ int ICACHE_FLASH_ATTR cgiRebootFirmware(HttpdConnData *connData) {
 	return HTTPD_CGI_DONE;
 }
 
-#endif
\ No newline at end of file
+#endif