Fixes for tracker