fix some issues for dandelion