Further fixes for reorg.