More heartbeat and interview handler formatting fixes