[Core] Slight updates due to changes in dandelion core