Fix another bug, keep alive messages