Update for latest HeldCore build