Optracker minor updates