Reorg fixups

Minor cleanup from the reorg.