Fixes for {code:10} and {code:11} heartbeat.