diff --git a/lib/nodes/test_rtt.cpp b/lib/nodes/test_rtt.cpp
index 83bca0769..34a84259b 100644
--- a/lib/nodes/test_rtt.cpp
+++ b/lib/nodes/test_rtt.cpp
@@ -105,7 +105,7 @@ int test_rtt_prepare(struct node *n)
 			max_values = c->values;
 
 		c->filename_formatted = (char *) alloc(NAME_MAX);
-	
+
 		strftime(c->filename_formatted, NAME_MAX, c->filename, &tm);
 	}
 
diff --git a/lib/path_source.cpp b/lib/path_source.cpp
index d65649cfd..a306c2a92 100644
--- a/lib/path_source.cpp
+++ b/lib/path_source.cpp
@@ -151,7 +151,7 @@ int path_source_read(struct path_source *ps, struct path *p, int i)
 #endif
 
 	if (p->mask.test(i)) {
-		/* Check if we received an update from all nodes/ */
+		/* Check if we received an update from all nodes */
 		if ((p->mode == PATH_MODE_ANY) ||
 		    (p->mode == PATH_MODE_ALL && p->mask == p->received)) {
 			path_destination_enqueue(p, muxed_smps, toenqueue);
diff --git a/lib/web.cpp b/lib/web.cpp
index 955c19f1c..12351b028 100644
--- a/lib/web.cpp
+++ b/lib/web.cpp
@@ -259,7 +259,7 @@ void Web::start()
 	logger->info("Starting sub-system: htdocs={}", htdocs.c_str());
 
 	/* update web root of mount point */
-	mounts[1].origin = htdocs.c_str();
+	mounts[ARRAY_LEN(mounts)-1].origin = htdocs.c_str();
 
 	context = lws_create_context(&ctx_info);
 	if (context == nullptr)