More reorg and fixes for reorg