I thought I had already committed this? Fixes for heartbeat output