Update for latest HeldCore dev