Fix some objective tracker issues.