Improve rpa-tracking.