Just a few tweaks that have fallen thru the cracks.
BTW, this target needs some upkeep WRT the new frame_info model.