Account for uplinks other than controllers.

Also fix relative states handling.