Both elevators had rivets missing on the T.E. They had never been set because it's so tight in there. I was able to grind down a no-hole yoke and get them set with no drama.
The trim servo had already been mounted to the closeout plate, but the edges of the nut plates stuck out far enough that it wouldn't fit in the hole. I ground about 1/32" off the side of two nut plates and that was enough to squeeze it past them. The closeout plate isn't laying flat with the surrounding skin because the nut plate rivets are proud. Haven't decided yet if I'll shave these or what.