Fix reorg issues