Fix core loading