diff --git a/include/villas/mapping.h b/include/villas/mapping.h
index c468cb4bd..f0b1f0f34 100644
--- a/include/villas/mapping.h
+++ b/include/villas/mapping.h
@@ -1,5 +1,6 @@
 /** Sample value remapping for mux.
  *
+ * @file
  * @author Steffen Vogel <stvogel@eonerc.rwth-aachen.de>
  * @copyright 2017, Institute for Automation of Complex Power Systems, EONERC
  *********************************************************************************/
diff --git a/lib/nodes/websocket.c b/lib/nodes/websocket.c
index 4907cbf3d..ce25b2c87 100644
--- a/lib/nodes/websocket.c
+++ b/lib/nodes/websocket.c
@@ -151,7 +151,7 @@ int websocket_protocol_cb(struct lws *wsi, enum lws_callback_reasons reason, voi
 	
 	switch (reason) {
 		case LWS_CALLBACK_CLIENT_ESTABLISHED:
-		case LWS_CALLBACK_ESTABLISHED: {
+		case LWS_CALLBACK_ESTABLISHED:
 			c->state = STATE_DESTROYED;
 			
 			/* Get path of incoming request */
@@ -186,7 +186,6 @@ int websocket_protocol_cb(struct lws *wsi, enum lws_callback_reasons reason, voi
 				return -1;
 
 			return 0;
-		}
 
 		case LWS_CALLBACK_CLOSED:
 			websocket_connection_destroy(c);
@@ -225,7 +224,7 @@ int websocket_protocol_cb(struct lws *wsi, enum lws_callback_reasons reason, voi
 			return 0;
 
 		case LWS_CALLBACK_CLIENT_RECEIVE:
-		case LWS_CALLBACK_RECEIVE: {
+		case LWS_CALLBACK_RECEIVE:
 			w = c->node->_vd;
 
 			if (c->node->state != STATE_STARTED)
@@ -258,9 +257,7 @@ int websocket_protocol_cb(struct lws *wsi, enum lws_callback_reasons reason, voi
 				/* Next message */
 				msg = (struct webmsg *) ((char *) msg + WEBMSG_LEN(msg->length));
 			}
-		
 			return 0;
-		}
 
 		default:
 			return 0;
diff --git a/lib/web.c b/lib/web.c
index 91df59515..c65821f97 100644
--- a/lib/web.c
+++ b/lib/web.c
@@ -193,6 +193,8 @@ int web_start(struct web *w)
 
 int web_stop(struct web *w)
 {
+	info("Stopping Web sub-system");
+
 	if (w->state == STATE_STARTED)
 		lws_cancel_service(w->context);