Addressed remaining tracker issues