Preparation for reorg; a few interface fixes.