diff --git a/src/document/gemini/renderer.c b/src/document/gemini/renderer.c
index 7fbaf5a17..2702c2355 100644
--- a/src/document/gemini/renderer.c
+++ b/src/document/gemini/renderer.c
@@ -180,6 +180,8 @@ render_gemini_document(struct cache_entry *cached, struct document *document,
 							in_list = 1;
 							add_to_string(&html, "<ul>\n");
 							add_string_to_string(&html, &html_line);
+						} else {
+							add_string_to_string(&html, &html_line);
 						}
 					} else if (in_list) {
 						in_list = 0;
diff --git a/src/main/select.c b/src/main/select.c
index 6fd4fa053..34696eeca 100644
--- a/src/main/select.c
+++ b/src/main/select.c
@@ -77,7 +77,7 @@ do {							\
 #define FD_SETSIZE 1024
 #endif
 
-#ifdef CONFIG_LIBEVENT
+#if defined(CONFIG_LIBEVENT) && defined(CONFIG_LIBCURL)
 
 /* Information associated with a specific easy handle */
 typedef struct _ConnInfo
diff --git a/src/mime/backend/mailcap.c b/src/mime/backend/mailcap.c
index 0df01587b..58e3b0b18 100644
--- a/src/mime/backend/mailcap.c
+++ b/src/mime/backend/mailcap.c
@@ -122,6 +122,15 @@ static union option_info mailcap_options[] = {
 	NULL_OPTION_INFO,
 };
 
+#ifdef TEST_MAILCAP
+#define get_opt_mailcap(which)		mailcap_options[(which)].init
+#define get_mailcap(which)		get_opt_mailcap(which)
+#define get_mailcap_ask()		get_mailcap(MAILCAP_ASK).value_long
+#define get_mailcap_description()	get_mailcap(MAILCAP_DESCRIPTION).value_long
+#define get_mailcap_enable()		get_mailcap(MAILCAP_ENABLE).value_long
+#define get_mailcap_prioritize()	get_mailcap(MAILCAP_PRIORITIZE).value_long
+#define get_mailcap_path()		get_mailcap(MAILCAP_PATH).value_dataptr
+#else
 #define get_opt_mailcap(which)		mailcap_options[(which)].option
 #define get_mailcap(which)		get_opt_mailcap(which).value
 #define get_mailcap_ask()		get_mailcap(MAILCAP_ASK).number
@@ -129,6 +138,7 @@ static union option_info mailcap_options[] = {
 #define get_mailcap_enable()		get_mailcap(MAILCAP_ENABLE).number
 #define get_mailcap_prioritize()	get_mailcap(MAILCAP_PRIORITIZE).number
 #define get_mailcap_path()		get_mailcap(MAILCAP_PATH).string
+#endif
 
 /* State variables */
 static struct hash *mailcap_map = NULL;
diff --git a/src/protocol/test/stub.c b/src/protocol/test/stub.c
index af2997b81..d7bb83a49 100644
--- a/src/protocol/test/stub.c
+++ b/src/protocol/test/stub.c
@@ -52,10 +52,12 @@ STUB_MODULE(file_protocol_module);
 STUB_MODULE(finger_protocol_module);
 STUB_MODULE(fsp_protocol_module);
 STUB_MODULE(ftp_protocol_module);
+STUB_MODULE(ftpes_protocol_module);
 STUB_MODULE(gemini_protocol_module);
 STUB_MODULE(gopher_protocol_module);
 STUB_MODULE(http_protocol_module);
 STUB_MODULE(nntp_protocol_module);
+STUB_MODULE(sftp_protocol_module);
 STUB_MODULE(smb_protocol_module);
 STUB_MODULE(uri_rewrite_module);
 STUB_MODULE(user_protocol_module);
@@ -90,12 +92,14 @@ STUB_PROTOCOL_HANDLER(file_protocol_handler);
 STUB_PROTOCOL_HANDLER(finger_protocol_handler);
 STUB_PROTOCOL_HANDLER(fsp_protocol_handler);
 STUB_PROTOCOL_HANDLER(ftp_protocol_handler);
+STUB_PROTOCOL_HANDLER(ftpes_protocol_handler);
 STUB_PROTOCOL_HANDLER(gemini_protocol_handler);
 STUB_PROTOCOL_HANDLER(gopher_protocol_handler);
 STUB_PROTOCOL_HANDLER(http_protocol_handler);
 STUB_PROTOCOL_HANDLER(news_protocol_handler);
 STUB_PROTOCOL_HANDLER(nntp_protocol_handler);
 STUB_PROTOCOL_HANDLER(proxy_protocol_handler);
+STUB_PROTOCOL_HANDLER(sftp_protocol_handler);
 STUB_PROTOCOL_HANDLER(smb_protocol_handler);
 STUB_PROTOCOL_EXTERNAL_HANDLER(user_protocol_handler);