Better keep-alive handling.