Consolidated, consistent rt target fixes single-threaded build