Fixes for data reorg