Add a reminder TODO to fix case where aggregator returns nil for HA
Fix ignored allocation in dtrs lookup