Sorry it's taken me forever to respond to this. I just independently made a change that addressed one of these two problems. That is, making the "sync" stage thoroughly clean the source directory. I'll post some more about buildbot maintenance shortly. Thanks, Roland