fix wrong struct storage in old union, branch scheduler amends