adding core fixes