Improve http handling.