Fixed keep-alive and retuning.