Dragonfly and fixes