*: fix two DragonFly issues