Review all the things that were touched as TheControlBar->getObserverLookAtPlayer or TheControlBar->getCurrentlyViewedPlayer and see if some of these need changing to TheControlBar->getObservedPlayer or rts::getObservedOrLocalPlayer()
Anything that has more to do with observing rather than looking at player stats, should refer to observed player.