Small fixes to heart recovery