KeepAlive fixes