Several more systembuilder bugfixes.