Heartrate fixes