Fixes for webserver handlers