More refactoring fixes on final bundling commands.