Don't swallow error on upgrade
Clean up keepalives somewhat