More improvements to rpa-tracking.