Http server improvements