More changes to make webserver compatible with tool.