diff --git a/hermit/arch/x86/mm/page.c b/hermit/arch/x86/mm/page.c
index 98bf098a5..f2b62aa3d 100644
--- a/hermit/arch/x86/mm/page.c
+++ b/hermit/arch/x86/mm/page.c
@@ -173,7 +173,7 @@ out:
 
 int page_unmap(size_t viraddr, size_t npages)
 {
-	uint8_t ipi = 0;
+	//uint8_t ipi = 0;
 
 	spinlock_irqsave_lock(&page_lock);
 
@@ -183,11 +183,14 @@ int page_unmap(size_t viraddr, size_t npages)
 	for (vpn=start; vpn<start+npages; vpn++) {
 		self[0][vpn] = 0;
 		tlb_flush_one_page(vpn << PAGE_BITS, 0);
-		ipi = 1;
+		//ipi = 1;
 	}
 
-	if (ipi)
-		ipi_tlb_flush();
+	/*
+	 * IPI isn't required because unmaping is only used by shutdown the system
+	 */
+	/*if (ipi)
+		ipi_tlb_flush();*/
 
 	spinlock_irqsave_unlock(&page_lock);
 
diff --git a/hermit/kernel/main.c b/hermit/kernel/main.c
index 48cbf07c7..280369f4f 100644
--- a/hermit/kernel/main.c
+++ b/hermit/kernel/main.c
@@ -270,8 +270,11 @@ int network_shutdown(void)
 {
 	kputs("Shutdown LwIP\n");
 
-	if (libc_sd > 0)
-		lwip_close(libc_sd);
+	if (libc_sd >= 0) {
+		int s = libc_sd;
+		libc_sd = -1;
+		lwip_close(s);
+	}
 
         mmnif_shutdown();
 	//stats_display();