Keepalive changes