Resolving a few assemble issues with the reorg