Keepalive tweaks