[tracker] small modifications for demo