Alot of heartbeat fixes and FreebSD addons