core fixes