fixes for HTTP