Many more fixes to systembuilder.