1diff --git a/gpxe/src/config/general.h b/gpxe/src/config/general.h
2index 0a9e625..de51f9f 100644
3--- a/gpxe/src/config/general.h
4+++ b/gpxe/src/config/general.h
5@@ -55,8 +55,8 @@ FILE_LICENCE ( GPL2_OR_LATER );
6
7 #define	DOWNLOAD_PROTO_TFTP	/* Trivial File Transfer Protocol */
8 #define	DOWNLOAD_PROTO_HTTP	/* Hypertext Transfer Protocol */
9-#undef	DOWNLOAD_PROTO_HTTPS	/* Secure Hypertext Transfer Protocol */
10-#undef	DOWNLOAD_PROTO_FTP	/* File Transfer Protocol */
11+#define	DOWNLOAD_PROTO_HTTPS	/* Secure Hypertext Transfer Protocol */
12+#define	DOWNLOAD_PROTO_FTP	/* File Transfer Protocol */
13 #undef	DOWNLOAD_PROTO_TFTM	/* Multicast Trivial File Transfer Protocol */
14 #undef	DOWNLOAD_PROTO_SLAM	/* Scalable Local Area Multicast */
15
16diff --git a/gpxe/src/config/general.h b/gpxe/src/config/general.h
17index de51f9f..2f5a938 100644
18--- a/gpxe/src/config/general.h
19+++ b/gpxe/src/config/general.h
20@@ -31,7 +31,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
21  * Timer configuration
22  *
23  */
24-#define BANNER_TIMEOUT	20	/* Tenths of a second for which the shell
25+#define BANNER_TIMEOUT	0	/* Tenths of a second for which the shell
26 				   banner should appear */
27
28 /*
29diff --git a/gpxe/src/hci/shell_banner.c b/gpxe/src/hci/shell_banner.c
30index 8afefe3..b92e08e 100644
31--- a/gpxe/src/hci/shell_banner.c
32+++ b/gpxe/src/hci/shell_banner.c
33@@ -41,6 +41,9 @@ int shell_banner ( void ) {
34 	int wait_count;
35 	int key;
36
37+	if ( BANNER_TIMEOUT <= 0 )
38+		return enter_shell;
39+
40 	printf ( "\nPress Ctrl-B for the gPXE command line..." );
41
42 	/* Wait for key */
43diff --git a/gpxe/src/include/gpxe/tcp.h b/gpxe/src/include/gpxe/tcp.h
44index 7ae7eab..9dc39fc 100644
45--- a/gpxe/src/include/gpxe/tcp.h
46+++ b/gpxe/src/include/gpxe/tcp.h
47@@ -286,8 +286,8 @@ struct tcp_options {
48  * actually use 65536, we use a window size of (65536-4) to ensure
49  * that payloads remain dword-aligned.
50  */
51-//#define TCP_MAX_WINDOW_SIZE	( 65536 - 4 )
52-#define TCP_MAX_WINDOW_SIZE	4096
53+#define TCP_MAX_WINDOW_SIZE	( 65536 - 4 )
54+//#define TCP_MAX_WINDOW_SIZE	4096
55
56 /**
57  * Path MTU
58diff --git a/gpxe/src/core/malloc.c b/gpxe/src/core/malloc.c
59index 8b0bc24..0153748 100644
60--- a/gpxe/src/core/malloc.c
61+++ b/gpxe/src/core/malloc.c
62@@ -78,9 +78,9 @@ size_t freemem;
63 /**
64  * Heap size
65  *
66- * Currently fixed at 128kB.
67+ * Currently fixed at 512kB.
68  */
69-#define HEAP_SIZE ( 128 * 1024 )
70+#define HEAP_SIZE ( 512 * 1024 )
71
72 /** The heap itself */
73 static char heap[HEAP_SIZE] __attribute__ (( aligned ( __alignof__(void *) )));
74