Fixes for ObjectiveTracker