multiple core fixes