small fixes from tracker