Fix bugs with bootstrap & reorg