Minor clean ups in webserver modules