Last core fixes