Increase timeout and heartbeat