Fixed assemble build code, and prepared for clean merge