Eliminated more bugs in systembuilder.