magickly fixes for dragonfly v1.0.1 upgrade