bzr:rebuild some fix