Minor changes to heartbeat checker