0: fixes and clean-up for instance builder