More bugfixes for new HTTP server